From f87034c3c2b9e11dee678dc3ff3458d2485c1710 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 20 Jun 2012 18:07:04 -0700
Subject: PATH-760: First pass at Leo's new design for the build floater.

---
 indra/newview/llpanelobject.cpp                    |  16 ---
 indra/newview/llpanelobject.h                      |   2 -
 indra/newview/llpanelpermissions.cpp               |  27 +++++
 .../newview/skins/default/xui/en/floater_tools.xml | 113 ++++++++++++---------
 indra/newview/skins/default/xui/en/strings.xml     |   6 +-
 5 files changed, 96 insertions(+), 68 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp
index be4ce4700a..a740db00e2 100644
--- a/indra/newview/llpanelobject.cpp
+++ b/indra/newview/llpanelobject.cpp
@@ -121,12 +121,6 @@ BOOL	LLPanelObject::postBuild()
 	mCheckPhantom = getChild<LLCheckBoxCtrl>("Phantom Checkbox Ctrl");
 	childSetCommitCallback("Phantom Checkbox Ctrl",onCommitPhantom,this);
        
-	// Permanent checkbox
-	mCheckPermanent = getChild<LLCheckBoxCtrl>("Permanent Checkbox Ctrl");
-       
-	// Character checkbox
-	mCheckCharacter = getChild<LLCheckBoxCtrl>("Character Checkbox Ctrl");
-
 	// Position
 	mLabelPosition = getChild<LLTextBox>("label position");
 	mCtrlPosX = getChild<LLSpinCtrl>("Pos X");
@@ -527,12 +521,6 @@ void LLPanelObject::getState( )
 	mCheckPhantom->set( mIsPhantom );
 	mCheckPhantom->setEnabled( roots_selected>0 && editable && !is_flexible && !is_permanent_enforced && !is_character);
 
-	mCheckPermanent->set(is_permanent);
-	mCheckPermanent->setEnabled(FALSE);
-
-	mCheckCharacter->set(is_character);
-	mCheckCharacter->setEnabled(FALSE);
-       
 	//----------------------------------------------------------------------------
 
 	S32 selected_item	= MI_BOX;
@@ -1884,10 +1872,6 @@ void LLPanelObject::clearCtrls()
 	mCheckTemporary	->setEnabled( FALSE );
 	mCheckPhantom	->set(FALSE);
 	mCheckPhantom	->setEnabled( FALSE );
-	mCheckPermanent	->set(FALSE);
-	mCheckPermanent	->setEnabled( FALSE );
-	mCheckCharacter	->set(FALSE);
-	mCheckCharacter	->setEnabled( FALSE );
 	
 	// Disable text labels
 	mLabelPosition	->setEnabled( FALSE );
diff --git a/indra/newview/llpanelobject.h b/indra/newview/llpanelobject.h
index 34a19b3dfa..c4cf27ab1a 100644
--- a/indra/newview/llpanelobject.h
+++ b/indra/newview/llpanelobject.h
@@ -150,8 +150,6 @@ protected:
 	LLCheckBoxCtrl	*mCheckPhysics;
 	LLCheckBoxCtrl	*mCheckTemporary;
 	LLCheckBoxCtrl	*mCheckPhantom;
-	LLCheckBoxCtrl  *mCheckPermanent;
-	LLCheckBoxCtrl  *mCheckCharacter;
 
 	LLTextureCtrl   *mCtrlSculptTexture;
 	LLTextBox       *mLabelSculptType;
diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp
index 64481717f5..262dadf907 100644
--- a/indra/newview/llpanelpermissions.cpp
+++ b/indra/newview/llpanelpermissions.cpp
@@ -62,6 +62,7 @@
 #include "llspinctrl.h"
 #include "roles_constants.h"
 #include "llgroupactions.h"
+#include "lltrans.h"
 
 
 U8 string_value_to_click_action(std::string p_value);
@@ -180,6 +181,9 @@ void LLPanelPermissions::disableAll()
 	getChildView("perm_modify")->setEnabled(FALSE);
 	getChild<LLUICtrl>("perm_modify")->setValue(LLStringUtil::null);
 
+	getChildView("pathfinding_attributes_value")->setEnabled(FALSE);
+	getChild<LLUICtrl>("pathfinding_attributes_value")->setValue(LLStringUtil::null);
+
 	getChildView("Creator:")->setEnabled(FALSE);
 	getChild<LLUICtrl>("Creator Name")->setValue(LLStringUtil::null);
 	getChildView("Creator Name")->setEnabled(FALSE);
@@ -329,6 +333,29 @@ void LLPanelPermissions::refresh()
 	getChildView("perm_modify")->setEnabled(TRUE);
 	getChild<LLUICtrl>("perm_modify")->setValue(MODIFY_INFO_STRINGS[string_index]);
 
+	getChildView("pathfinding_attributes_value")->setEnabled(TRUE);
+	std::string pfAttrName;
+	if (is_one_object)
+	{
+		if (objectp->flagObjectPermanent())
+		{
+			pfAttrName = "Pathfinding_Object_Attr_Permanent";
+		}
+		else if (objectp->flagCharacter())
+		{
+			pfAttrName = "Pathfinding_Object_Attr_Character";
+		}
+		else
+		{
+			pfAttrName = "Pathfinding_Object_Attr_None";
+		}
+	}
+	else
+	{
+		pfAttrName = "Pathfinding_Object_Attr_MultiSelect";
+	}
+	getChild<LLUICtrl>("pathfinding_attributes_value")->setValue(LLTrans::getString(pfAttrName));
+
 	getChildView("Permissions:")->setEnabled(TRUE);
 	
 	// Update creator text field
diff --git a/indra/newview/skins/default/xui/en/floater_tools.xml b/indra/newview/skins/default/xui/en/floater_tools.xml
index c881bb9d81..c49ce90e6b 100644
--- a/indra/newview/skins/default/xui/en/floater_tools.xml
+++ b/indra/newview/skins/default/xui/en/floater_tools.xml
@@ -980,7 +980,7 @@
              height="19"
              layout="topleft"
              name="Owner:"
-             top_pad="13"
+             top_pad="3"
              width="90">
                 Owner:
             </text>
@@ -1008,7 +1008,7 @@
              left="10"
              height="18"
              name="Group:"
-             top_pad="17"
+             top_pad="3"
              width="75">
                 Group:
             </text>
@@ -1037,7 +1037,7 @@
              layout="topleft"
              name="checkbox share with group"
              tool_tip="Allow all members of the set group to share your modify permissions for this object. You must Deed to enable role restrictions."
-             top_pad="10"
+             top_pad="5"
              left="100"
              width="87" />
             <button
@@ -1059,7 +1059,7 @@
              top_pad="10"
              left="10"
              name="label click action"
-             width="118">
+             width="82">
                 Click to:
             </text>
             <combo_box
@@ -1067,7 +1067,7 @@
              height="23"
              layout="topleft"
              name="clickaction"
-             width="148"
+             width="130"
              left_pad="10">
                 <combo_box.item
                  label="Touch  (default)"
@@ -1100,19 +1100,39 @@
              layout="topleft"
              name="checkbox for sale"
              left="7"
-             width="100" />
-<!-- NEW SALE TYPE COMBO BOX -->
+             width="97" />
+  <!-- NEW PRICE SPINNER
+Objects are allowed to be for sale for L$0 to invoke buy UI behavior
+even though the user gets a free copy.
+-->
+  <spinner
+      follows="left|top"
+      decimal_digits="0"
+      increment="1"
+      left_pad="0"
+      control_name="Edit Cost"
+      name="Edit Cost"
+      label="L$"
+      label_width="15"
+      label_text.valign="center"
+      valign="center"
+      width="85"
+      min_val="0"
+      height="20"
+      max_val="999999999" />
+  <!-- NEW SALE TYPE COMBO BOX -->
       <combo_box
-            left_pad="10"
+            left_pad="8"
             layout="topleft"
             follows="left|top"
             allow_text_entry="false"
             height="23"
+            top_pad="-23"
             initial_value="2"
             max_chars="20"
             mouse_opaque="true"
             name="sale type"
-            width="168">
+            width="89">
         <combo_box.item
            name="Copy"
            label="Copy"
@@ -1126,31 +1146,13 @@
            label="Original"
            value="1" />
       </combo_box>
-<!-- NEW PRICE SPINNER
-Objects are allowed to be for sale for L$0 to invoke buy UI behavior
-even though the user gets a free copy.
--->
-    <spinner
-        follows="left|top"
-        decimal_digits="0"
-        increment="1"
-        top_pad="8"
-        left="118"
-        control_name="Edit Cost"
-        name="Edit Cost"
-        label="Price: L$"
-        label_width="65"
-        width="165"
-        min_val="0"
-        height="20"
-        max_val="999999999" />
       <check_box
 	   height="15"
 	   width="110"
 	   top_pad="5"
 	   label="Show in search"
        layout="topleft"
-	   left="100"
+	   left="7"
        name="search_check"
        tool_tip="Let people see this object in search results" />
 		<panel
@@ -1163,15 +1165,16 @@ even though the user gets a free copy.
          name="perms_build"
          left="0"
          top_pad="4"
-         height="105"
+         height="121"
          width="290">
             <text
              type="string"
              length="1"
              left="10"
+             word_wrap="true"
              top_pad="9"
              text_color="EmphasisColor"
-             height="16"
+             height="32"
              follows="left|top|right"
              layout="topleft"
              name="perm_modify"
@@ -1241,7 +1244,7 @@ even though the user gets a free copy.
              type="string"
              text_color="EmphasisColor"
              length="1"
-             top="9"
+             top="23"
              follows="left|top"
              layout="topleft"
              left="230"
@@ -1316,7 +1319,36 @@ even though the user gets a free copy.
                 F:
             </text>
         </panel>
-      </panel>
+		<panel
+         border="false"
+         follows="left|top"
+         layout="topleft"
+         mouse_opaque="false"
+         name="pathfinding_attrs_panel"
+         left="0"
+         top_pad="0"
+         height="25"
+         width="290">
+      <text
+         type="string"
+         follows="left|top"
+         name="pathfinding_attributes_label"
+         top_pad="4"
+         width="150"
+         left="10">
+        Pathfinding attributes:
+      </text>
+      <text
+         type="string"
+         follows="left|top"
+         text_color="EmphasisColor"
+         name="pathfinding_attributes_value"
+         width="130"
+         word_wrap="false"
+         left_pad="0">
+      </text>
+    </panel>
+  </panel>
       <!-- Object tab -->
       <panel
          border="false"
@@ -1363,23 +1395,6 @@ even though the user gets a free copy.
              tool_tip="Causes object to not collide with other objects or avatars"
              top_pad="0"
              width="123" />
-            <check_box
-             height="19"
-             enabled="false"
-             label="Permanent"
-             layout="topleft"
-             name="Permanent Checkbox Ctrl"
-             top_pad="0"
-             width="123" />
-        <check_box
-         height="19"
-         enabled="false"
-         label="Character"
-         layout="topleft"
-         name="Character Checkbox Ctrl"
-         top_pad="0"
-         width="123" />
-
         <text
              type="string"
              length="1"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 4fdbe557b9..3c79fdfb73 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -3890,7 +3890,11 @@ Try enclosing path to the editor with double quotes.
 
   <!-- Pathfinding -->
   <string name="Pathfinding_Wiki_URL">http://wiki.secondlife.com/wiki/Pathfinding_Tools_in_the_Second_Life_Viewer</string>
-  
+  <string name="Pathfinding_Object_Attr_None">&lt;none&gt;</string>
+  <string name="Pathfinding_Object_Attr_Permanent">Permanent</string>
+  <string name="Pathfinding_Object_Attr_Character">Character</string>
+  <string name="Pathfinding_Object_Attr_MultiSelect">&lt;multiple&gt;</string>
+
   <!-- Snapshot image quality levels -->
   <string name="snapshot_quality_very_low">Very Low</string>
   <string name="snapshot_quality_low">Low</string>
-- 
cgit v1.2.3