diff options
| -rw-r--r-- | indra/newview/llimfloater.cpp | 10 | ||||
| -rw-r--r-- | indra/newview/llimfloater.h | 1 | 
2 files changed, 0 insertions, 11 deletions
diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index b05568f353..02eb29eedd 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -484,16 +484,6 @@ void LLIMFloater::setDocked(bool docked, bool pop_on_undock)  	}  } -void LLIMFloater::setTornOff(bool torn_off) -{ -	// When IM Floater isn't torn off, "close" button should be hidden. -	// This call will just disables it, since there is a hack in LLFloater::updateButton, -	// which prevents hiding of close button in that case. -	setCanClose(torn_off); - -	LLTransientDockableFloater::setTornOff(torn_off); -} -  void LLIMFloater::setVisible(BOOL visible)  {  	LLNotificationsUI::LLScreenChannel* channel = dynamic_cast<LLNotificationsUI::LLScreenChannel*> diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h index bc7a43e852..87ccad1d34 100644 --- a/indra/newview/llimfloater.h +++ b/indra/newview/llimfloater.h @@ -64,7 +64,6 @@ public:  	// LLFloater overrides  	/*virtual*/ void onClose(bool app_quitting);  	/*virtual*/ void setDocked(bool docked, bool pop_on_undock = true); -	/*virtual*/ void setTornOff(bool torn_off);  	// Make IM conversion visible and update the message history  	static LLIMFloater* show(const LLUUID& session_id);  | 
