1. simon_linden
  2. viewer-rabbit

Commits

Mark Palange (Mani)  committed a16af32

Fixing bugs discovered in merge with viewer development

  • Participants
  • Parent commits a1657d7
  • Branches default

Comments (0)

Files changed (3)

File indra/newview/llspeakbutton.cpp

View file
 
 LLSpeakButton::~LLSpeakButton()
 {
-	LLTransientFloaterMgr::getInstance()->removeControlView(mSpeakBtn);
-	LLTransientFloaterMgr::getInstance()->removeControlView(mShowBtn);
+	if(LLTransientFloaterMgr::instanceExists())
+	{
+		LLTransientFloaterMgr::getInstance()->removeControlView(mSpeakBtn);
+		LLTransientFloaterMgr::getInstance()->removeControlView(mShowBtn);
+	}
 }
 
 void LLSpeakButton::setSpeakToolTip(const std::string& msg)

File indra/newview/llspeakingindicatormanager.cpp

View file
 
 void LLSpeakingIndicatorManager::unregisterSpeakingIndicator(const LLUUID& speaker_id, const LLSpeakingIndicator* const speaking_indicator)
 {
-	SpeakingIndicatorManager::instance().unregisterSpeakingIndicator(speaker_id, speaking_indicator);
+	if(SpeakingIndicatorManager::instanceExists())
+	{
+		SpeakingIndicatorManager::instance().unregisterSpeakingIndicator(speaker_id, speaking_indicator);
+	}
 }
 
 // EOF

File indra/viewer_components/updater/tests/llupdaterservice_test.cpp

View file
 
 	BOOL getNextFileInDir(const std::string &dirname, 
 						  const std::string &mask, 
-						  std::string &fname, BOOL wrap) 
+						  std::string &fname) 
 	{
 		return false;
 	}