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));

7
indra/newview/skins/default/xui/en-us/menu_viewer.xml
View File

@@ -491,10 +491,11 @@
<menu bottom="-18" create_jump_keys="true" drop_shadow="true" enabled="true"
height="339" label="World" left="0" mouse_opaque="false" name="World"
opaque="true" tear_off="true" width="185">
<menu_item_call bottom="-29" enabled="true" height="19" label="Chat" left="0"
<menu_item_check bottom="-29" enabled="true" height="19" label="Chat" left="0"
mouse_opaque="true" name="Chat" shortcut="" width="185">
<on_click function="FloaterShow" userdata="chatbar" />
</menu_item_call>
<on_click function="ToggleControl" userdata="ChatVisible"/>
<on_check control="ChatVisible"/>
</menu_item_check>
<menu_item_check bottom="-67" enabled="true" height="19" label="Always Run" left="0"
mouse_opaque="true" name="Always Run" shortcut="control|R" width="185">
<on_click function="ShowFloater" userdata="always run" />

4
indra/newview/skins/default/xui/en-us/panel_toolbar.xml
View File

@@ -9,9 +9,7 @@
<icon image_name="spacer24.tga" width="2" height="2" follows="left|right" color="0,0,0,0" left="0" />
</layout_panel>
<layout_panel name="panel2" height="24" width="50" auto_resize="false" user_resize="false" visibility_control="ToolbarVisibleChatbar">
<button bottom="0" height="24" image_selected="btn_chatbar_selected.tga" scale_image="true" image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn" image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)" width="50" follows="left|right" control_name="ChatVisible">
<button.commit_callback function="ShowFloater" parameter="chatbar"/>
</button>
<button bottom="0" height="24" image_selected="btn_chatbar_selected.tga" scale_image="true" image_unselected="btn_chatbar.tga" label="" left="2" name="chat_btn" image_overlay="icn_chatbar.tga" tool_tip="Show Chat Bar. (Enter)" width="50" follows="left|right" control_name="ChatVisible" toggle="true"/>
</layout_panel>
<layout_panel name="panel3" height="2" width="2" auto_resize="false" user_resize="false" visibility_control="ToolbarVisibleChatbar">
<icon image_name="spacer24.tga" width="2" height="2" follows="left|right" color="0,0,0,0"/>