Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix broked World->Chat

Browse Source
This commit is contained in:
Lirusaito
2014-12-16 21:35:28 -05:00
parent b67f55cff7
commit 81ef1292ed
3 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
indra/newview/llmenucommands.cpp
View File

@@ -116,12 +116,6 @@
// [/RLVa:LF]
#include "shfloatermediaticker.h"
void handle_chat()
{
// give focus to chatbar if it's open but not focused
static const LLCachedControl<bool> chat_visible("ChatVisible",true);
(chat_visible && gFocusMgr.childHasKeyboardFocus(gChatBar)) ? LLChatBar::stopChat() : LLChatBar::startChat(NULL);
}
void handle_debug_avatar_textures(void*);
template<typename T> void handle_singleton_toggle(void*);
void show_outfit_dialog() { new LLMakeOutfitDialog(false); }
@@ -177,7 +171,6 @@ struct MenuFloaterDict : public LLSingleton<MenuFloaterDict>
registerFloater("build", boost::bind(toggle_build));
registerFloater("buy currency", boost::bind(LLFloaterBuyCurrency::buyCurrency));
registerFloater("buy land", boost::bind(&LLViewerParcelMgr::startBuyLand, boost::bind(LLViewerParcelMgr::getInstance), false));
registerFloater("chatbar", boost::bind(handle_chat));
registerFloater("complaint reporter", boost::bind(LLFloaterReporter::showFromMenu, COMPLAINT_REPORT));
registerFloater("DayCycle", boost::bind(LLFloaterDayCycle::show), boost::bind(LLFloaterDayCycle::isOpen));
registerFloater("debug avatar", boost::bind(handle_debug_avatar_textures, (void*)NULL));