aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/linden/indra/newview/llviewermenu.cpp
diff options
context:
space:
mode:
authorJacek Antonelli2008-12-12 23:24:52 -0600
committerJacek Antonelli2008-12-12 23:25:00 -0600
commitd1345838c6e36c35dbe3a6b683eb8ffe274b024a (patch)
tree5e727fcabbd5cf0337c11192bfe4db6191c7b044 /linden/indra/newview/llviewermenu.cpp
parentSecond Life viewer sources 1.22.2-RC (diff)
downloadmeta-impy-d1345838c6e36c35dbe3a6b683eb8ffe274b024a.zip
meta-impy-d1345838c6e36c35dbe3a6b683eb8ffe274b024a.tar.gz
meta-impy-d1345838c6e36c35dbe3a6b683eb8ffe274b024a.tar.bz2
meta-impy-d1345838c6e36c35dbe3a6b683eb8ffe274b024a.tar.xz
Second Life viewer sources 1.22.3-RC
Diffstat (limited to '')
-rw-r--r--linden/indra/newview/llviewermenu.cpp7
1 files changed, 5 insertions, 2 deletions
diff --git a/linden/indra/newview/llviewermenu.cpp b/linden/indra/newview/llviewermenu.cpp
index 7c08c8a..dff31e1 100644
--- a/linden/indra/newview/llviewermenu.cpp
+++ b/linden/indra/newview/llviewermenu.cpp
@@ -1740,7 +1740,7 @@ class LLViewCommunicate : public view_listener_t
1740{ 1740{
1741 bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) 1741 bool handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
1742 { 1742 {
1743 if (LLFloaterChatterBox::getInstance()->getFloaterCount() == 0) 1743 if (LLFloaterChatterBox::getInstance()->getFloaterCount() == 0)
1744 { 1744 {
1745 LLFloaterMyFriends::toggleInstance(); 1745 LLFloaterMyFriends::toggleInstance();
1746 } 1746 }
@@ -1748,7 +1748,6 @@ class LLViewCommunicate : public view_listener_t
1748 { 1748 {
1749 LLFloaterChatterBox::toggleInstance(); 1749 LLFloaterChatterBox::toggleInstance();
1750 } 1750 }
1751
1752 return true; 1751 return true;
1753 } 1752 }
1754}; 1753};
@@ -5291,6 +5290,10 @@ class LLFloaterVisible : public view_listener_t
5291 { 5290 {
5292 new_value = LLFloaterMyFriends::instanceVisible(0); 5291 new_value = LLFloaterMyFriends::instanceVisible(0);
5293 } 5292 }
5293 else if (floater_name == "communicate")
5294 {
5295 new_value = LLFloaterChatterBox::instanceVisible();
5296 }
5294 else if (floater_name == "toolbar") 5297 else if (floater_name == "toolbar")
5295 { 5298 {
5296 new_value = LLToolBar::visible(NULL); 5299 new_value = LLToolBar::visible(NULL);