diff options
| author | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-02 09:39:07 -0800 |
|---|---|---|
| committer | Gilbert Gonzales <gilbert@lindenlab.com> | 2013-01-02 09:39:07 -0800 |
| commit | 3ffc29a1aeb4bd560865929934f428fde13a6812 (patch) | |
| tree | 0f5a6fd6bb40299389d3a229f25269352c818915 /indra/newview/skins | |
| parent | e8be7955d86d0673b35182ba1ae590748b4ba5d2 (diff) | |
| parent | 1eae887434331357e057498905f7f5ff8f9f9c77 (diff) | |
merging in latest changes
Diffstat (limited to 'indra/newview/skins')
3 files changed, 10 insertions, 11 deletions
diff --git a/indra/newview/skins/default/xui/en/floater_conversation_log.xml b/indra/newview/skins/default/xui/en/floater_conversation_log.xml index 960db137b3..cf61348a66 100644 --- a/indra/newview/skins/default/xui/en/floater_conversation_log.xml +++ b/indra/newview/skins/default/xui/en/floater_conversation_log.xml @@ -17,12 +17,10 @@ Conversations are not being logged. To log conversations in the future, select "Save IM logs on my computer" under Preferences > Privacy. </string> <panel - bottom="0" follows="left|top|right" height="32" left="0" name="buttons_panel" - right="0" top="0"> <filter_editor follows="left|top|right" diff --git a/indra/newview/skins/default/xui/en/floater_im_container.xml b/indra/newview/skins/default/xui/en/floater_im_container.xml index cbf1830093..e7638fe669 100644 --- a/indra/newview/skins/default/xui/en/floater_im_container.xml +++ b/indra/newview/skins/default/xui/en/floater_im_container.xml @@ -113,11 +113,12 @@ </layout_panel> </layout_stack> <panel + bottom="-5" follows="all" layout="topleft" name="conversations_list_panel" opaque="true" - top_pad="0" + top="35" left="5" right="-1"/> </layout_panel> @@ -127,7 +128,7 @@ name="messages_layout_panel" expanded_min_dim="222"> <panel_container - bottom="-1" + bottom="-5" follows="all" layout="topleft" left="0" diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml index 00424e97f6..76de81559b 100644 --- a/indra/newview/skins/default/xui/en/menu_viewer.xml +++ b/indra/newview/skins/default/xui/en/menu_viewer.xml @@ -1273,35 +1273,35 @@ label="User’s guide" name="User’s guide"> <menu_item_call.on_click - function="Advanced.WebBrowserTest" + function="Advanced.ShowURL" parameter="http://community.secondlife.com/t5/English-Knowledge-Base/Second-Life-User-s-Guide/ta-p/1244857"/> </menu_item_call> <menu_item_call label="Knowledge Base" name="Knowledge Base"> <menu_item_call.on_click - function="Advanced.WebBrowserTest" + function="Advanced.ShowURL" parameter="http://community.secondlife.com/t5/tkb/communitypage"/> </menu_item_call> <menu_item_call label="Wiki" name="Wiki"> <menu_item_call.on_click - function="Advanced.WebBrowserTest" + function="Advanced.ShowURL" parameter="http://wiki.secondlife.com"/> </menu_item_call> <menu_item_call label="Community Forums" name="Community Forums"> <menu_item_call.on_click - function="Advanced.WebBrowserTest" + function="Advanced.ShowURL" parameter="http://community.secondlife.com/t5/Forums/ct-p/Forums"/> </menu_item_call> <menu_item_call label="Support portal" name="Support portal"> <menu_item_call.on_click - function="Advanced.WebBrowserTest" + function="Advanced.ShowURL" parameter="https://support.secondlife.com/"/> </menu_item_call> <menu_item_separator/> @@ -1309,14 +1309,14 @@ label="[SECOND_LIFE] News" name="Second Life News"> <menu_item_call.on_click - function="Advanced.WebBrowserTest" + function="Advanced.ShowURL" parameter="http://community.secondlife.com/t5/Featured-News/bg-p/blog_feature_news"/> </menu_item_call> <menu_item_call label="[SECOND_LIFE] Blogs" name="Second Life Blogs"> <menu_item_call.on_click - function="Advanced.WebBrowserTest" + function="Advanced.ShowURL" parameter="http://community.secondlife.com/t5/Blogs/ct-p/Blogs"/> </menu_item_call> <menu_item_separator/> |