summaryrefslogtreecommitdiff
path: root/indra/newview/skins/default
diff options
context:
space:
mode:
authorYuri Chebotarev <ychebotarev@productengine.com>2010-05-06 19:52:56 +0300
committerYuri Chebotarev <ychebotarev@productengine.com>2010-05-06 19:52:56 +0300
commit17b42d5c5e0577cfcb59dc8972ddee602938d419 (patch)
treee3d9d3afc480f9ea60d55dc4d107befec0d439af /indra/newview/skins/default
parent0674dd9bd9d808658158a91a9cedf1b3e274c094 (diff)
EXT-6102 FIXED Add custom view for world rect with special reshape processing
reviwed Mike Antipov at https://codereview.productengine.com/secondlife/r/357/ --HG-- branch : product-engine
Diffstat (limited to 'indra/newview/skins/default')
-rw-r--r--indra/newview/skins/default/xui/en/main_view.xml2
-rw-r--r--indra/newview/skins/default/xui/en/panel_preferences_advanced.xml10
2 files changed, 11 insertions, 1 deletions
diff --git a/indra/newview/skins/default/xui/en/main_view.xml b/indra/newview/skins/default/xui/en/main_view.xml
index b2e4a7ad95..e42b88abc3 100644
--- a/indra/newview/skins/default/xui/en/main_view.xml
+++ b/indra/newview/skins/default/xui/en/main_view.xml
@@ -50,7 +50,7 @@
name="non_side_tray_view"
user_resize="false"
width="500">
- <view bottom="500"
+ <world_view bottom="500"
follows="all"
height="500"
left="0"
diff --git a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
index 69e8e6fdcc..0129d97616 100644
--- a/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
+++ b/indra/newview/skins/default/xui/en/panel_preferences_advanced.xml
@@ -94,6 +94,16 @@ Automatic position for:
name="appearance_camera_movement"
tool_tip="Use automatic camera positioning while in edit mode"
width="242" />
+ <check_box
+ control_name="SidebarCameraMovement"
+ follows="left|top"
+ height="16"
+ initial_value="1"
+ label="Sidebar"
+ layout="topleft"
+ name="appearance_sidebar_positioning"
+ tool_tip="Use automatic camera positioning for sidebar"
+ width="242" />
<icon
follows="left|top"
height="18"