livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed default state for chatbar in Nearby Chat (Default: on), inverted xml name.

meow-7.2.2
WoLf 2011-01-26 17:52:22 +01:00
parent cb9c322db3
commit 6045bcada3
4 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
indra/newview/app_settings/settings.xml
View File

@ -13038,7 +13038,7 @@
<key>Type</key>
<string>Boolean</string>
<key>Value</key>
<integer>0</integer>
<integer>1</integer>
</map>
</map>
</llsd>

4
indra/newview/llviewerfloaterreg.cpp
View File

@ -154,11 +154,11 @@ void LLViewerFloaterReg::registerFloaters()
LLFloaterReg::add("camera", "floater_camera.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCamera>);
if (gSavedSettings.getBOOL("PhoenixNearbyChatbar")) // xml toggle for chatbar in nearby chat -WoLf
{
LLFloaterReg::add("nearby_chat", "floater_nearby_chat-cb.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLNearbyChat>);
LLFloaterReg::add("nearby_chat", "floater_nearby_chat.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLNearbyChat>);
}
else
{
LLFloaterReg::add("nearby_chat", "floater_nearby_chat.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLNearbyChat>);
LLFloaterReg::add("nearby_chat", "floater_nearby_chat-cb.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLNearbyChat>);
}
LLFloaterReg::add("compile_queue", "floater_script_queue.xml", (LLFloaterBuildFunc)&LLFloaterReg::build<LLFloaterCompileQueue>);

22
indra/newview/skins/default/xui/en/floater_nearby_chat-cb.xml
View File

@ -4,7 +4,7 @@
background_visible="true"
default_tab_group="1"
follows="all"
height="350"
height="300"
layout="topleft"
left="0"
name="nearby_chat"
@ -23,7 +23,7 @@
animate="false"
default_tab_group="2"
follows="all"
height="320"
height="300"
width="394"
layout="topleft"
orientation="horizontal"
@ -37,7 +37,7 @@
left="0"
tab_group="2"
top="0"
height="200"
height="300"
width="254"
user_resize="true">
<button
@ -74,26 +74,14 @@
<chat_history
font="SansSerifSmall"
follows="left|right|top|bottom"
height="155"
bottom_pad="20"
height="255"
name="chat_history"
parse_highlights="true"
parse_urls="true"
left="1"
width="249"
width="250"
value="test1">
</chat_history>
<line_editor
bottom="0"
follows="left|right|bottom"
font="SansSerifSmall"
height="20"
label="To local chat"
layout="bottomleft"
name="chat_box"
tab_group="3"
width="249">
</line_editor>
</layout_panel>
</layout_stack>

22
indra/newview/skins/default/xui/en/floater_nearby_chat.xml
View File

@ -4,7 +4,7 @@
background_visible="true"
default_tab_group="1"
follows="all"
height="300"
height="350"
layout="topleft"
left="0"
name="nearby_chat"
@ -23,7 +23,7 @@
animate="false"
default_tab_group="2"
follows="all"
height="300"
height="320"
width="394"
layout="topleft"
orientation="horizontal"
@ -37,7 +37,7 @@
left="0"
tab_group="2"
top="0"
height="300"
height="200"
width="254"
user_resize="true">
<button
@ -74,14 +74,26 @@
<chat_history
font="SansSerifSmall"
follows="left|right|top|bottom"
height="255"
height="155"
bottom_pad="20"
name="chat_history"
parse_highlights="true"
parse_urls="true"
left="1"
width="250"
width="249"
value="test1">
</chat_history>
<line_editor
bottom="0"
follows="left|right|bottom"
font="SansSerifSmall"
height="20"
label="To local chat"
layout="bottomleft"
name="chat_box"
tab_group="3"
width="249">
</line_editor>
</layout_panel>
</layout_stack>