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

Automated merge with ssh://hg.lindenlab.com/richard/viewer-experience-fui

meow-7.2.2
Richard Nelson 2011-10-14 16:10:37 -07:00
parent b07fa1d11b 9c454b6afa
commit 4413ea12b1
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
indra/newview/llnearbychathandler.cpp
View File

@ -373,7 +373,7 @@ void LLNearbyChatScreenChannel::arrangeToasts()
if (!getParent())
{
// connect to floater snap region to get resize events
// connect to floater snap region just to get resize events, we don't care about being a proper widget
floater_snap_region->addChild(this);
setFollows(FOLLOWS_ALL);
}
@ -383,11 +383,12 @@ void LLNearbyChatScreenChannel::arrangeToasts()
LLRect channel_rect;
floater_snap_region->localRectToOtherView(floater_snap_region->getLocalRect(), &channel_rect, gFloaterView);
channel_rect.mLeft += 10;
channel_rect.mRight = channel_rect.mLeft + 300;
S32 channel_bottom = channel_rect.mBottom;
S32 bottom = channel_bottom;
S32 bottom = channel_bottom + 10;
S32 margin = gSavedSettings.getS32("ToastGap");
//sort active toasts

14
indra/newview/skins/default/xui/en/main_view.xml
View File

@ -8,13 +8,6 @@
tab_stop="false"
name="main_view"
width="1024">
<view top="0"
follows="all"
height="768"
left="0"
mouse_opaque="false"
name="world_view_rect"
width="1024"/>
<layout_stack border_size="0"
follows="all"
mouse_opaque="false"
@ -57,6 +50,13 @@
tab_stop="false"
name="world_panel"
width="1024">
<view top="0"
follows="all"
height="500"
left="0"
mouse_opaque="false"
name="world_view_rect"
width="1024"/>
<panel follows="left|top|right"
height="19"
left="0"

2
indra/newview/skins/default/xui/en/strings.xml
View File

@ -3683,7 +3683,7 @@ Try enclosing path to the editor with double quotes.
<string name="Command_AboutLand_Tooltip">Information about the land you're visiting</string>
<string name="Command_Appearance_Tooltip">Change your avatar</string>
<string name="Command_Avatar_Tooltip">Choose a complete avatar</string>
<string name="Command_Build_Tooltip">Building objects and reshaping them</string>
<string name="Command_Build_Tooltip">Building objects and reshaping terrain</string>
<string name="Command_Chat_Tooltip">Chat with people nearby using text</string>
<string name="Command_Compass_Tooltip">Compass</string>
<string name="Command_Destinations_Tooltip">Destinations of interest</string>