From 15fceb47a9b36e88469aa3fbe770485df0650bde Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 8 Sep 2011 13:20:15 -0700
Subject: Backed out changeset: b5b389170dcd

---
 indra/newview/skins/default/xui/en/floater_camera.xml | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/indra/newview/skins/default/xui/en/floater_camera.xml b/indra/newview/skins/default/xui/en/floater_camera.xml
index 527d2fab94..da2be18db6 100644
--- a/indra/newview/skins/default/xui/en/floater_camera.xml
+++ b/indra/newview/skins/default/xui/en/floater_camera.xml
@@ -63,8 +63,7 @@
          width="212"
          visible="false">
         <panel_camera_item
-          name="front_view"
-          top="0">
+          name="front_view">
           <panel_camera_item.mousedown_callback
             function="CameraPresets.ChangeView"
             parameter="front_view" />
@@ -79,7 +78,6 @@
         </panel_camera_item>
         <panel_camera_item
           name="group_view"
-          top="34"
           top_pad="4">
           <panel_camera_item.mousedown_callback
             function="CameraPresets.ChangeView"
@@ -95,7 +93,6 @@
         </panel_camera_item>
         <panel_camera_item
           name="rear_view"
-          top="68"
           layout="topleft"
           top_pad="4">
           <panel_camera_item.mousedown_callback
@@ -124,8 +121,7 @@
           width="212"
           visible="false">
         <panel_camera_item
-          name="object_view"
-          top="0">
+          name="object_view">
           <panel_camera_item.mousedown_callback
             function="CameraPresets.ChangeView"
             parameter="object_view" />
@@ -140,7 +136,6 @@
         </panel_camera_item>
         <panel_camera_item
           name="mouselook_view"
-          top="34"
           layout="topleft">
           <panel_camera_item.mousedown_callback
             function="CameraPresets.ChangeView"
-- 
cgit v1.2.3


From 72913ddf4987cae5970741c75f4306815acc5afb Mon Sep 17 00:00:00 2001
From: Richard Linden <none@none>
Date: Thu, 8 Sep 2011 22:35:53 -0700
Subject: EXP-1196 FIX Fix param block template ordering

---
 indra/llui/llview.cpp        | 8 ++++++++
 indra/llxuixml/llinitparam.h | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/indra/llui/llview.cpp b/indra/llui/llview.cpp
index 0616c2a0c0..60452b9ae4 100644
--- a/indra/llui/llview.cpp
+++ b/indra/llui/llview.cpp
@@ -2579,26 +2579,34 @@ void LLView::applyXUILayout(LLView::Params& p, LLView* parent)
 		if (!p.rect.left.isProvided())
 		{
 			p.rect.left.set(default_rect.mLeft, false);
+			//HACK: get around the fact that setting a rect param component value won't invalidate the existing rect object value
+			p.rect.paramChanged(p.rect.left, true);
 		}
 		if (!p.rect.bottom.isProvided())
 		{
 			p.rect.bottom.set(default_rect.mBottom, false);
+			p.rect.paramChanged(p.rect.bottom, true);
 		}
 		if (!p.rect.top.isProvided())
 		{
 			p.rect.top.set(default_rect.mTop, false);
+			p.rect.paramChanged(p.rect.top, true);
 		}
 		if (!p.rect.right.isProvided())
 		{
 			p.rect.right.set(default_rect.mRight, false);
+			p.rect.paramChanged(p.rect.right, true);
+
 		}
 		if (!p.rect.width.isProvided())
 		{
 			p.rect.width.set(default_rect.getWidth(), false);
+			p.rect.paramChanged(p.rect.width, true);
 		}
 		if (!p.rect.height.isProvided())
 		{
 			p.rect.height.set(default_rect.getHeight(), false);
+			p.rect.paramChanged(p.rect.height, true);
 		}
 	}
 }
diff --git a/indra/llxuixml/llinitparam.h b/indra/llxuixml/llinitparam.h
index e40bdb4a3d..9d0fe781ce 100644
--- a/indra/llxuixml/llinitparam.h
+++ b/indra/llxuixml/llinitparam.h
@@ -864,7 +864,7 @@ namespace LLInitParam
 		// propagate changed status up to enclosing block
 		/*virtual*/ void paramChanged(const Param& changed_param, bool user_provided)
 		{ 
-			ParamValue<T, NAME_VALUE_LOOKUP>::paramChanged(changed_param, user_provided);
+			param_value_t::paramChanged(changed_param, user_provided);
 			Param::enclosingBlock().paramChanged(*this, user_provided);
 			if (user_provided)
 			{
-- 
cgit v1.2.3