Removed ability to set default prim texture / inventory.

The texture (color, etc.) and inventory settings were inadvertently
being applied to objects rezzed from the user's inventory if the
Build window was open, potentially resulting in permanent damage
to no-copy items.

Kept ability to set default size, material, and flags.

2 files changed, 1 insertions, 132 deletions

diff --git a/linden/indra/newview/llviewerobjectlist.cpp b/linden/indra/newview/llviewerobjectlist.cpp
index a251d17..bfb248b 100644
--- a/linden/indra/newview/llviewerobjectlist.cpp
+++ b/linden/indra/newview/llviewerobjectlist.cpp
@@ -259,85 +259,6 @@ void LLViewerObjectList::processUpdateCore(LLViewerObject* objectp,
         // so that the drawable parent is set properly
         findOrphans(objectp, msg->getSenderIP(), msg->getSenderPort());
 
-        // Apply custom settings not set in llmanip and lltoolplacer here.
-        // Don't check for permissions in case opensim ever implements
-        // default prim permission support serverside -- MC
-        if (objectp 
-                && just_created 
-                && objectp->permYouOwner()
-                && objectp->mCreateSelected)
-        {
-                LLMessageSystem* msg = gMessageSystem;
-                msg->newMessageFast(_PREHASH_ObjectImage);
-                msg->nextBlockFast(_PREHASH_AgentData);
-                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
-                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());    
-                msg->nextBlockFast(_PREHASH_ObjectData);                                
-                msg->addU32Fast(_PREHASH_ObjectLocalID,  (U32)(objectp->mLocalID));
-                msg->addStringFast(_PREHASH_MediaURL, NULL);
-
-                LLPrimitive obj;
-                obj.setNumTEs(U8(10));  
-                S32 shinnyLevel = 0;
-                if(gSavedPerAccountSettings.getString("BuildPrefs_Shiny")== "None") shinnyLevel = 0;
-                if(gSavedPerAccountSettings.getString("BuildPrefs_Shiny")== "Low") shinnyLevel = 1;
-                if(gSavedPerAccountSettings.getString("BuildPrefs_Shiny")== "Medium") shinnyLevel = 2;
-                if(gSavedPerAccountSettings.getString("BuildPrefs_Shiny")== "High") shinnyLevel = 3;
-                
-                for (int i = 0; i < 10; i++)
-                {
-                        // I'm assuming this is because there's no good workaround for setting the default 
-                        // box texture manually without restarting? -- MC
-                        LLTextureEntry tex =  LLTextureEntry(LLUUID(gSavedPerAccountSettings.getString("BuildPrefs_Texture")));
-                        tex.setColor(gSavedPerAccountSettings.getColor4("BuildPrefs_Color"));
-                        tex.setAlpha(1.0 - ((gSavedPerAccountSettings.getF32("BuildPrefs_Alpha")) / 100.0));
-                        tex.setGlow(gSavedPerAccountSettings.getF32("BuildPrefs_Glow"));
-                        if(gSavedPerAccountSettings.getBOOL("BuildPrefs_FullBright"))
-                        {
-                                tex.setFullbright(TEM_FULLBRIGHT_MASK);
-                        }
-                                                        
-                        tex.setShiny((U8) shinnyLevel & TEM_SHINY_MASK);
-                        
-                        obj.setTE(U8(i), tex);
-                }
-
-                obj.packTEMessage(gMessageSystem);
-
-                msg->sendReliable(gAgent.getRegion()->getHost());
-                
-                msg->newMessage("ObjectFlagUpdate");
-                msg->nextBlockFast(_PREHASH_AgentData);
-                msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID() );
-                msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
-                msg->addU32Fast(_PREHASH_ObjectLocalID, (U32)(objectp->mLocalID) );
-                msg->addBOOLFast(_PREHASH_UsePhysics, gSavedPerAccountSettings.getBOOL("BuildPrefs_Physical"));
-                msg->addBOOL("IsTemporary", gSavedPerAccountSettings.getBOOL("BuildPrefs_Temporary"));
-                msg->addBOOL("IsPhantom", gSavedPerAccountSettings.getBOOL("BuildPrefs_Phantom") );
-                msg->addBOOL("CastsShadows", true );
-                msg->sendReliable(gAgent.getRegion()->getHost());
-
-                if(gSavedPerAccountSettings.getBOOL("BuildPrefs_EmbedItem"))
-                {
-                        LLViewerInventoryItem* item = (LLViewerInventoryItem*)gInventory.getItem((LLUUID)gSavedPerAccountSettings.getString("BuildPrefs_Item"));
-                        if(item)
-                        {
-                                if(item->getType()==LLAssetType::AT_LSL_TEXT)
-                                {
-                                        LLToolDragAndDrop::dropScript(objectp,
-                                                item,
-                                                TRUE,
-                                                LLToolDragAndDrop::SOURCE_AGENT,
-                                                gAgent.getID());
-                                }else
-                                {
-                                        LLToolDragAndDrop::dropInventory(objectp,item,LLToolDragAndDrop::SOURCE_AGENT,gAgent.getID());
-                                }
-                        }
-                        //llinfos << "SENDING CUBE TEXTURE.." << llendl;
-                }
-        }
-        
         // If we're just wandering around, don't create new objects selected.
         if (just_created 
                 && update_type != OUT_TERSE_IMPROVED 
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml b/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
index e7a1f89..7331aa6 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_build_options.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-297" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="right" height="370" min_height="370"
+     can_resize="false" follows="right" height="300" min_height="300"
      min_width="530" mouse_opaque="true" name="build options floater"
      rect_control="FloaterBuildOptionsRect" title="Advanced Build Options" width="530">
 
@@ -40,16 +40,10 @@
      bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
      h_pad="0" halign="left" height="10" left_delta="130" mouse_opaque="false"
      name="text_box4" v_pad="0" width="150">        Settings</text>
-  <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-     bottom_delta="0" drop_shadow_visible="true" enabled="true" follows="left|top" font="SansSerifSmall"
-     h_pad="0" halign="left" height="10" left_delta="190" mouse_opaque="false"
-     name="text_box5" v_pad="0" width="150">        Texture</text>
   <view_border bevel_style="none" border_thickness="1" bottom_delta="-98" follows="top|left" height="90"
      left="14" name="SizeBorder" width="120" />
   <view_border bevel_style="none" border_thickness="1" bottom_delta="-0" follows="top|left" height="90"
      left_delta="134" name="SettingsBorder" width="100" />
-  <view_border bevel_style="none" border_thickness="1" bottom_delta="0" follows="top|left" height="90"
-     left_delta="114" name="TextureBorder" width="250" />
   
   <spinner bottom="-200" decimal_digits="5" follows="left|top" height="16" increment="0.05"
      label="X Size" label_width="40" left="20" max_val="10" min_val="0.01"
@@ -81,52 +75,6 @@
     <combo_item name="Rubber" value="Rubber">Rubber</combo_item>
   </combo_box>
   
-  <texture_picker allow_no_texture="false" bottom="-265" can_apply_immediately="true" default_image_name="Default"
-     follows="left|top" height="80" label="Texture" left="270" mouse_opaque="true"
-     name="texture control" tool_tip="Click to choose a picture"
-     width="64"/>
-  <color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="0" can_apply_immediately="true"
-     color="1, 1, 1, 1" follows="left|top" height="80" label="Color" left_delta="75"
-     mouse_opaque="true" name="colorswatch" tool_tip="Click to open Color Picker" width="64" />
-  
-  <spinner bottom="-200" decimal_digits="0" follows="left|top" height="16" increment="1"
-     label="Alpha" label_width="40" left_delta="70" max_val="100" min_val="0"
-     mouse_opaque="true" name="alpha" width="90" />
-  <spinner bottom_delta="-20" enabled="true" decimal_digits="2" follows="left|top" height="16"
-     increment="0.05" label="Glow" label_width="40" left_delta="0" max_val="1"
-     min_val="0" mouse_opaque="true" name="glow" width="90" />
-  <check_box bottom_delta="-20" enabled="true" follows="left|top" font="SansSerifSmall" height="16"
-     label="Full Bright" left_delta="0" mouse_opaque="true" name="FBToggle" radio_style="false"
-     width="100" />
-  <combo_box allow_text_entry="false" bottom_delta="-20" follows="left|top" height="18" left_delta="0"
-     max_chars="20" mouse_opaque="true" name="combobox shininess" tool_tip="Set the amount of shine for the object"
-     width="90">
-    <combo_item name="None" value="None">          None</combo_item>
-    <combo_item name="Low" value="Low">          Low</combo_item>
-    <combo_item name="Medium" value="Medium">          Medium</combo_item>
-    <combo_item name="High" value="High">          High</combo_item>
-  </combo_box>
-  
-  <view_border blevel_style="in" bottom_delta="-40" follows="left|top" height="16" left="14"
-     mouse_opaque="false" name="im_give_drop_target_rect" width="400"/>
-  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom_delta="0"
-     drop_shadow_visible="true" follows="left|top" font="SansSerifSmall" h_pad="0" halign="center"
-     height="16" left_delta="0" mouse_opaque="true" name="Give inventory" tool_tip="Drop an inventory item here."
-     v_pad="2" width="400">        Drop an inventory item here to have it added to the prim contents.</text>
-  <view_border blevel_style="in" bottom_delta="-18" follows="left|top" height="16" left_delta="0"
-     mouse_opaque="false" name="build_item_add_disp_rect" width="400"/>
-  <button bottom_delta="0" enabled="true" font="SansSerif" halign="center" height="20"
-     label="Clear Item" left_delta="405" mouse_opaque="true"
-     name="btn_clear" scale_image="true" width="90" />
-  <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" bottom_delta="0"
-     drop_shadow_visible="true" follows="left|top" font="SansSerifSmall" h_pad="0" halign="center"
-     height="16" left="14" mouse_opaque="true" name="build_item_add_disp_rect_txt" tool_tip=""
-     v_pad="2" width="400">        Currently set to: ITEM</text>
-  <check_box name="BuildPrefsEmbedItem" bottom_delta="-25" enabled="true" 
-     follows="left|top" font="SansSerifSmall" height="16"
-     initial_value="false" label="Embed an item into the newly created object" left_delta="0"
-     mouse_opaque="true" radio_style="false" width="270" />
-  
   <view_border bevel_style="none" border_thickness="1" bottom="-145" follows="top|left" height="105"
      left="198" name="PivotBorder" width="135"/>
   <text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"