From b7e329ea244b140f99c4f3aef209f73b1d65e0d1 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 15 Nov 2008 21:19:06 -0600
Subject: Imprudence 1.0.0 RC1 released.

---
 ChangeLog.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index d2256c2..a6ab587 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,8 @@
+2008-11-15  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* Imprudence 1.0.0 RC1 released.
+
+
 2008-11-05  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* linden/indra/newview/viewer_manifest.py:
-- 
cgit v1.1


From d62c978208ea97ae9794384e57a270b3c18703ba Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 16 Nov 2008 20:32:02 -0600
Subject: Removed floater_tools.xml from silver skin.

It was out of sync with the default version, and the only
changes that LL had made to it were tiny tweaks to button size
and position. It will now correctly inherit from default skin.
---
 ChangeLog.txt                                      |    9 +
 .../skins/silver/xui/en-us/floater_tools.xml       | 1275 --------------------
 2 files changed, 9 insertions(+), 1275 deletions(-)
 delete mode 100644 linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml

diff --git a/ChangeLog.txt b/ChangeLog.txt
index a6ab587..f0a359d 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,12 @@
+2008-11-16  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml:
+	Removed floater_tools.xml from silver skin.
+	It was out of sync with the default version, and the only
+	changes that LL had made to it were tiny tweaks to button size
+	and position. It will now correctly inherit from default skin.
+
+
 2008-11-15  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* Imprudence 1.0.0 RC1 released.
diff --git a/linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml
deleted file mode 100644
index 9b5d340..0000000
--- a/linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml
+++ /dev/null
@@ -1,1275 +0,0 @@
-<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
-<floater bottom="-359" can_close="true" can_drag_on_left="false" can_minimize="true"
-     can_resize="false" follows="left|top" height="550" 
-     left="308" min_height="100" min_width="100" mouse_opaque="true"
-     name="toolbox floater" rect_control="ToolboxRect" sound_flags="0" title=""
-     short_title="Build" width="272">
-
-<!-- Main floater tabs -->
-
-	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-	     image_disabled="tool_zoom.tga"
-	     image_disabled_selected="tool_zoom_active.tga"
-	     image_selected="tool_zoom_active.tga" image_unselected="tool_zoom.tga"
-	     label="" label_selected="" left="4" mouse_opaque="true" name="button focus"
-	     tool_tip="Focus" width="32" />
-	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-	     image_disabled="UIImgGrabUUID"
-	     image_disabled_selected="UIImgGrabSelectedUUID"
-	     image_selected="UIImgGrabSelectedUUID" image_unselected="UIImgGrabUUID"
-	     label="" label_selected="" left="40" mouse_opaque="true" name="button move"
-	     tool_tip="Move" width="32" />
-	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-	     image_disabled="UIImgFaceUUID"
-	     image_disabled_selected="UIImgFaceSelectedUUID"
-	     image_selected="UIImgFaceSelectedUUID" image_unselected="UIImgFaceUUID"
-	     label="" label_selected="" left="76" mouse_opaque="true" name="button edit"
-	     tool_tip="Edit" width="32" />
-	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-	     image_disabled="UIImgCreateUUID"
-	     image_disabled_selected="UIImgCreateSelectedUUID"
-	     image_selected="UIImgCreateSelectedUUID" image_unselected="UIImgCreateUUID"
-	     label="" label_selected="" left="112" mouse_opaque="true"
-	     name="button create" tool_tip="Create" width="32" />
-	<button bottom="-34" follows="left|top" font="SansSerif" halign="center" height="32"
-	     image_disabled="tool_dozer.tga"
-	     image_disabled_selected="tool_dozer_active.tga"
-	     image_selected="tool_dozer_active.tga" image_unselected="tool_dozer.tga"
-	     label="" label_selected="" left="148" mouse_opaque="true"
-	     name="button land" tool_tip="Land" width="32" />
-
-<!-- Focus panel -->
-
-	<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Zoom" left="4" mouse_opaque="true"
-	     name="radio zoom" radio_style="true" width="114" />
-	<volume_slider bottom="-69" follows="left|top" height="14" increment="0.01"
-	     initial_val="0.125" left="114" max_val="0.5" min_val="0"
-	     mouse_opaque="true" name="slider zoom" width="134" />
-	<check_box bottom="-84" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Orbit (Ctrl)" left="4" mouse_opaque="true"
-	     name="radio orbit" radio_style="true" width="114" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Pan (Ctrl-Shift)" left="4"
-	     mouse_opaque="true" name="radio pan" radio_style="true" width="114" />
-
-<!-- Move panel -->
-
-	<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Move" left="4" mouse_opaque="true"
-	     name="radio move" radio_style="true" width="114" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Lift (Ctrl)" left="4" mouse_opaque="true"
-	     name="radio lift" radio_style="true" width="114" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Spin (Ctrl-Shift)" left="4"
-	     mouse_opaque="true" name="radio spin" radio_style="true" width="114" />
-
-<!-- Edit panel -->
-
-	<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Position" left="4" mouse_opaque="true"
-	     name="radio position" radio_style="true" width="114" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Rotate (Ctrl)" left="4" mouse_opaque="true"
-	     name="radio rotate" radio_style="true" width="114" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Stretch (Ctrl-Shift)" left="4"
-	     mouse_opaque="true" name="radio stretch" radio_style="true" width="123" />
-	<check_box bottom_delta="-15" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Select Texture" left="4" mouse_opaque="true"
-	     name="radio select face" radio_style="true" width="114" />
-	<check_box bottom_delta="-19" control_name="EditLinkedParts" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Edit linked parts" left="4" mouse_opaque="true"
-	     name="checkbox edit linked parts" width="114" />
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="14" left="6"
-	     mouse_opaque="true" name="text ruler mode" v_pad="0" width="68">
-		Ruler mode:
-	</text>
-	<combo_box allow_text_entry="false" bottom_delta="-4" follows="left|top" height="20"
-	     left_delta="74" max_chars="20" mouse_opaque="true"
-	     name="combobox grid mode" width="86">
-		<combo_item name="World" value="World">
-			World
-		</combo_item>
-		<combo_item name="Local" value="Local">
-			Local
-		</combo_item>
-		<combo_item name="Reference" value="Reference">
-			Reference
-		</combo_item>
-	</combo_box>
-	<check_box bottom="-70" control_name="ScaleUniform" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Stretch Both Sides" left="143" mouse_opaque="true"
-	     name="checkbox uniform" width="134" />
-	<check_box bottom_delta="-15" control_name="ScaleStretchTextures" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="true"
-	     label="Stretch Textures" left_delta="0" mouse_opaque="true"
-	     name="checkbox stretch textures" width="134" />
-	<check_box bottom_delta="-19" control_name="SnapEnabled" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="true" label="Use Grid"
-	     left_delta="0" mouse_opaque="true" name="checkbox snap to grid" width="134" />
-	<button bottom_delta="-14" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="16" label="Options..." label_selected="Options..." left_delta="20"
-	     mouse_opaque="true" name="Options..." scale_image="TRUE" width="80" />
-
-<!-- Help text -->
-
-	<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom="-52" drop_shadow_visible="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-	     mouse_opaque="true" name="text status" v_pad="0" width="264">
-		Drag to move, shift-drag to copy
-	</text>
-
-<!-- Create panel -->
-
-	<button bottom="-78" follows="left|top" font="SansSerif" halign="center" height="30"
-	     image_disabled="object_cube.tga"
-	     image_disabled_selected="object_cube_active.tga"
-	     image_selected="object_cube_active.tga" image_unselected="object_cube.tga"
-	     label="" label_selected="" left="4" mouse_opaque="true" name="ToolCube"
-	     scale_image="TRUE" width="30" tool_tip="Cube"/>
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_prism.tga"
-	     image_disabled_selected="object_prism_active.tga"
-	     image_selected="object_prism_active.tga"
-	     image_unselected="object_prism.tga" label="" label_selected=""
-	     left_delta="28" mouse_opaque="true" name="ToolPrism" scale_image="TRUE"
-        tool_tip="Prism" width="30" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_pyramid.tga"
-	     image_disabled_selected="object_pyramid_active.tga"
-	     image_selected="object_pyramid_active.tga"
-	     image_unselected="object_pyramid.tga" label="" label_selected=""
-	     left_delta="28" mouse_opaque="true" name="ToolPyramid" scale_image="TRUE"
- tool_tip="Pyramid" width="30" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_tetrahedron.tga"
-	     image_disabled_selected="object_tetrahedron_active.tga"
-	     image_selected="object_tetrahedron_active.tga"
-	     image_unselected="object_tetrahedron.tga" label="" label_selected=""
-	     left_delta="23" mouse_opaque="true" name="ToolTetrahedron"
-	     scale_image="TRUE" tool_tip="Tetrahedron" width="30" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_cylinder.tga"
-	     image_disabled_selected="object_cylinder_active.tga"
-	     image_selected="object_cylinder_active.tga"
-	     image_unselected="object_cylinder.tga" label="" label_selected=""
-	     left_delta="23" mouse_opaque="true" tool_tip="Cylinder" name="ToolCylinder" scale_image="TRUE"
-	     width="30" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_hemi_cylinder.tga"
-	     image_disabled_selected="object_hemi_cylinder_active.tga"
-	     image_selected="object_hemi_cylinder_active.tga"
-	     image_unselected="object_hemi_cylinder.tga" label="" label_selected=""
-	     left_delta="23" mouse_opaque="true" name="ToolHemiCylinder"
-	     scale_image="TRUE" tool_tip="Hemicylinder" width="30" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_cone.tga"
-	     image_disabled_selected="object_cone_active.tga"
-	     image_selected="object_cone_active.tga" image_unselected="object_cone.tga"
-	     label="" label_selected="" left_delta="23" mouse_opaque="true"
-	     name="ToolCone" scale_image="TRUE" tool_tip="Cone" width="30" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_hemi_cone.tga"
-	     image_disabled_selected="object_hemi_cone_active.tga"
-	     image_selected="object_hemi_cone_active.tga"
-	     image_unselected="object_hemi_cone.tga" label="" label_selected=""
-	     left_delta="23" mouse_opaque="true" name="ToolHemiCone" scale_image="TRUE"
-      tool_tip="Hemicone" width="30" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_sphere.tga"
-	     image_disabled_selected="object_sphere_active.tga"
-	     image_selected="object_sphere_active.tga"
-	     image_unselected="object_sphere.tga" label="" label_selected=""
-	     left_delta="23" mouse_opaque="true" name="ToolSphere" scale_image="TRUE"
-	     width="30" tool_tip="Sphere" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_hemi_sphere.tga"
-	     image_disabled_selected="object_hemi_sphere_active.tga"
-	     image_selected="object_hemi_sphere_active.tga"
-	     image_unselected="object_hemi_sphere.tga" label="" label_selected=""
-	     left_delta="23" mouse_opaque="true" name="ToolHemiSphere"
-	     scale_image="TRUE" tool_tip="Hemisphere" width="30" />
-	<button bottom_delta="-23" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_torus.tga"
-	     image_disabled_selected="object_torus_active.tga"
-	     image_selected="object_torus_active.tga"
-	     image_unselected="object_torus.tga" label="" label_selected="" left="4"
-	     mouse_opaque="true" name="ToolTorus" scale_image="TRUE" tool_tip="Torus" width="30" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_tube.tga"
-	     image_disabled_selected="object_tube_active.tga"
-	     image_selected="object_tube_active.tga" image_unselected="object_tube.tga"
-	     label="" label_selected="" left_delta="23" mouse_opaque="true"
-	     name="ToolTube" scale_image="TRUE" tool_tip="Tube" width="30" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_ring.tga"
-	     image_disabled_selected="object_ring_active.tga"
-	     image_selected="object_ring_active.tga" image_unselected="object_ring.tga"
-	     label="" label_selected="" left_delta="23" mouse_opaque="true"
-	     name="ToolRing" scale_image="TRUE" tool_tip="Ring" width="30" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_tree.tga"
-	     image_disabled_selected="object_tree_active.tga"
-	     image_selected="object_tree_active.tga" image_unselected="object_tree.tga"
-	     label="" label_selected="" left_delta="23" mouse_opaque="true"
-	     name="ToolTree" scale_image="TRUE" tool_tip="Tree" width="30" />
-	<button bottom_delta="0" follows="left|top" font="SansSerif" halign="center"
-	     height="30" image_disabled="object_grass.tga"
-	     image_disabled_selected="object_grass_active.tga"
-	     image_selected="object_grass_active.tga"
-	     image_unselected="object_grass.tga" label="" label_selected=""
-	     left_delta="28" mouse_opaque="true" name="ToolGrass" scale_image="TRUE"
-	     tool_tip="Grass" width="30" />
-	<check_box bottom="-120" control_name="CreateToolKeepSelected" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Keep Tool Selected" left="4" mouse_opaque="true"
-	     name="checkbox sticky" width="128" />
-	<check_box bottom_delta="-15" control_name="CreateToolCopySelection" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false"
-	     label="Copy Selection" left_delta="0" mouse_opaque="true"
-	     name="checkbox copy selection" width="134" />
-	<check_box bottom_delta="-15" control_name="CreateToolCopyCenters" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="true" label="Center Copy"
-	     left_delta="20" mouse_opaque="true" name="checkbox copy centers"
-	     width="134" />
-	<check_box bottom_delta="-15" control_name="CreateToolCopyRotates" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false" label="Rotate Copy"
-	     left_delta="0" mouse_opaque="true" name="checkbox copy rotates" width="134" />
-
-<!-- Land panel -->
-
-	<check_box bottom="-70" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Select Land" left="4" mouse_opaque="true"
-	     name="radio select land" radio_style="true" width="114" />
-	<check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Flatten Land" left="4" mouse_opaque="true"
-	     name="radio flatten" radio_style="true" width="114" />
-	<check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Raise Land" left="4" mouse_opaque="true"
-	     name="radio raise" radio_style="true" width="114" />
-	<check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Lower Land" left="4" mouse_opaque="true"
-	     name="radio lower" radio_style="true" width="114" />
-	<check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Smooth Land" left="4" mouse_opaque="true"
-	     name="radio smooth" radio_style="true" width="114" />
-	<check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Roughen Land" left="4" mouse_opaque="true"
-	     name="radio noise" radio_style="true" width="114" />
-	<check_box bottom_delta="-14" follows="left|top" font="SansSerifSmall" height="16"
-	     initial_value="false" label="Revert Land" left="4" mouse_opaque="true"
-	     name="radio revert" radio_style="true" width="114" />
-	<combo_box allow_text_entry="false" bottom="-85" follows="left|top" height="18" left="118"
-	     max_chars="20" mouse_opaque="true" name="combobox brush size" width="134">
-		<combo_item name="Small" value="Small">
-			Small
-		</combo_item>
-		<combo_item name="Medium" value="Medium">
-			Medium
-		</combo_item>
-		<combo_item name="Large" value="Large">
-			Large
-		</combo_item>
-	</combo_box>
-	<volume_slider bottom_delta="-19" follows="left|top" height="16" hidden="false" increment="0.1"
-         initial_val="0.00" left="176" max_val="2.0" min_val="-1.0"
-	     mouse_opaque="true" name="slider force" width="70" />	
-	<text type="string" length="1" bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-	     bottom_delta="4" drop_shadow_visible="true" enabled="true" follows="left|top"
-	     font="SansSerifSmall" h_pad="0" halign="left" height="12" hidden="false"
-	     left="126" mouse_opaque="true" name="Strength:" v_pad="0" width="128">
-	          Strength:
-	</text>    
-	<button bottom_delta="-20" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="16" label="Apply to selection" label_selected="Apply to selection"
-	     left="118" mouse_opaque="true" name="button apply to selection"
-	     scale_image="TRUE" tool_tip="Modify Selected Land" width="134" />
-	<check_box bottom_delta="-20" control_name="ShowParcelOwners" follows="left|top"
-	     font="SansSerifSmall" height="16" initial_value="false" label="Show Owners"
-	     left="118" mouse_opaque="true" name="checkbox show owners" width="134" />
-	<button bottom="-163" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="20" label="More &gt;&gt;" left="186" mouse_opaque="true"
-	     name="button more" scale_image="TRUE" tool_tip="Advanced Options"
-	     width="80" />
-	<button bottom_delta="0" follows="left|top" font="SansSerifSmall" halign="center"
-	     height="20" label="&lt;&lt; Less" left_delta="0" mouse_opaque="true"
-	     name="button less" scale_image="TRUE" tool_tip="Advanced Options"
-	     width="80" />
-
-<!-- Sub-tabs -->
-
-	<tab_container bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="false"
-	     name="Object Info Tabs" tab_max_width="52" tab_min_width="40"
-	     tab_position="top" width="272">
-		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-		     label="General" left="1" mouse_opaque="false" name="General" width="270">
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="Name:" v_pad="0" width="78">
-				Name:
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-26"
-			     follows="left|top|right" font="SansSerifSmall" height="16" left="88"
-			     max_length="63" mouse_opaque="true" name="Object Name"
-			     select_all_on_focus_received="true" width="172" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-40" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="Description:" v_pad="0" width="78">
-				Description:
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom="-46"
-			     follows="left|top|right" font="SansSerifSmall" height="16" left="88"
-			     max_length="127" mouse_opaque="true" name="Object Description"
-			     select_all_on_focus_received="true" width="172" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-66" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-			     mouse_opaque="true" name="Creator:" v_pad="0" width="78">
-				Creator:
-			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-66" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
-			     mouse_opaque="true" name="Creator Name" v_pad="0" width="88">
-				Thrax Linden
-			</text>
-			<button bottom="-66" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="16" label="Profile..." label_selected="Profile..." left_delta="94"
-			     mouse_opaque="true" name="button creator profile" scale_image="TRUE"
-			     width="78" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-86" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-			     mouse_opaque="true" name="Owner:" v_pad="0" width="78">
-				Owner:
-			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-86" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
-			     mouse_opaque="true" name="Owner Name" v_pad="0" width="88">
-				Thrax Linden
-			</text>
-			<button bottom="-86" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="16" label="Profile..." label_selected="Profile..." left_delta="94"
-			     mouse_opaque="true" name="button owner profile" scale_image="TRUE"
-			     width="78" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-106" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-			     mouse_opaque="true" name="Group:" v_pad="0" width="78">
-				Group:
-			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-106" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left_delta="78"
-			     mouse_opaque="true" name="Group Name Proxy" v_pad="0" visible="false"
-			     width="88">
-				The Lindens
-			</text>
-			<button bottom="-106" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="16" label="Set..." label_selected="Set..." left_delta="94"
-			     mouse_opaque="true" name="button set group" scale_image="TRUE" width="78" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-126" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-			     mouse_opaque="true" name="prim info" v_pad="0" width="166">
-				1 Object, 1 Primitive
-			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-			     mouse_opaque="true" name="Permissions:" v_pad="0" width="85">
-				Permissions:
-			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-20" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
-			     mouse_opaque="true" name="perm_modify" v_pad="0" width="250">
-				You can modify this object.
-			</text>
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Share with group" left="10"
-			     mouse_opaque="true" name="checkbox share with group"
-			     tool_tip="Allow group members to move, modify, copy and delete."
-			     width="166" />
-			<string name="text deed continued">
-				Deed...
-			</string>
-			<string name="text deed">
-				Deed
-			</string>
-			<button bottom="-186" follows="top|right" font="SansSerifSmall" halign="center"
-			     height="16" label="Deed..." label_selected="Deed..." left_delta="172"
-			     mouse_opaque="true" name="button deed" scale_image="TRUE"
-			     tool_tip="Group shared objects can be deeded by a group officer."
-			     width="78" />
-			<check_box bottom="-206" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Allow anyone to move" left="10"
-			     mouse_opaque="true" name="checkbox allow everyone move" width="142" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Allow anyone to copy" left="10"
-			     mouse_opaque="true" name="checkbox allow everyone copy" width="141" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Show in search" left="10" name="search_check"
-			     tool_tip="Let people see this object in search results" width="78" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="For Sale" left="10" mouse_opaque="true"
-			     name="checkbox for sale" width="78" />
-			<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="left" height="16" left_delta="90"
-			     mouse_opaque="true" name="Cost" v_pad="0" width="78">
-				Price:  L$
-			</text>
-			<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="0"
-			     follows="left|top|right" font="SansSerifSmall" height="16" left_delta="80"
-			     max_length="25" mouse_opaque="true" name="Edit Cost" width="75" />
-			<radio_group bottom="-286" draw_border="false" follows="left|top|right" height="16"
-			     left="42" mouse_opaque="true" name="sale type" width="218">
-				<radio_item bottom="-16" follows="left|top" height="16" left="0" mouse_opaque="true"
-				     name="Original" width="70">
-					Original
-				</radio_item>
-				<radio_item bottom="-16" follows="left|top" height="16" left="70" mouse_opaque="true"
-				     name="Copy" width="70">
-					Copy
-				</radio_item>
-				<radio_item bottom="-16" follows="left|top" height="16" left="140" mouse_opaque="true"
-				     name="Contents" width="76">
-					Contents
-				</radio_item>
-			</radio_group>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-298" drop_shadow_visible="true" follows="left|top|right"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="Next owner can:" v_pad="0" width="250">
-				Next owner can:
-			</text>
-			<check_box bottom_delta="-22" follows="left|top|right" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Modify" left="10" mouse_opaque="true"
-			     name="checkbox next owner can modify" width="250" />
-			<check_box bottom_delta="0" follows="left|top|right" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Copy" left_delta="60" mouse_opaque="true"
-			     name="checkbox next owner can copy" width="190" />
-			<check_box bottom_delta="0" follows="left|top|right" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Resell/Give away" left_delta="60"
-			     mouse_opaque="true" name="checkbox next owner can transfer" width="130" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-332" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="label click action" v_pad="0" width="150">
-				When Left-Clicked:
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-25" follows="left|top" height="18"
-			     left="10" max_chars="20" mouse_opaque="true" name="clickaction" width="150">
-			     <!-- Do not reorder these items, the index numbers are
-					used internally. JC -->
-				<combo_item name="Touch/grab(default)" value="Touch/grab (default)">
-					Touch/grab (default)
-				</combo_item>
-				<combo_item name="Sitonobject" value="Sit on object">
-					Sit on object
-				</combo_item>
-				<combo_item name="Buyobject" value="Buy object">
-					Buy object
-				</combo_item>
-				<combo_item name="Payobject" value="Pay object">
-					Pay object
-				</combo_item>
-				<combo_item name="Open" value="Open">
-					Open
-				</combo_item>
-				<combo_item name="Play" value="Play">
-					Play parcel media
-				</combo_item>
-				<combo_item name="Opemmedia" value="Open Media">
-					Open parcel media
-				</combo_item>
-			</combo_box>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-135" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
-			     mouse_opaque="true" name="B:" v_pad="0" width="174">
-				B:
-			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-135" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
-			     mouse_opaque="true" name="O:" v_pad="0" width="124">
-				O;
-			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-135" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
-			     mouse_opaque="true" name="G:" v_pad="0" width="74">
-				G:
-			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-147" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="88"
-			     mouse_opaque="true" name="E:" v_pad="0" width="174">
-				E:
-			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-147" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
-			     mouse_opaque="true" name="N:" v_pad="0" width="124">
-				N:
-			</text>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-147" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="50"
-			     mouse_opaque="true" name="F:" v_pad="0" width="74">
-				F:
-			</text>
-			<string name="text modify info 1">
-				You can modify this object.
-			</string>
-			<string name="text modify info 2">
-				You can modify these objects.
-			</string>
-			<string name="text modify info 3">
-				You cannot modify this object.
-			</string>
-			<string name="text modify info 4">
-				You cannot modify these objects.
-			</string>
-			<string name="text modify warning">
-				Must select entire object to set permissions.
-			</string>
-			<string name="Cost Default">
-			Price:           L$
-			</string>
-			<string name="Cost Total">
-			Total Price:  L$
-			</string>
-			<string name="Cost Per Unit">
-			Price Per:     L$
-			</string>
-			<string name="Cost Mixed">
-			Mixed Price
-			</string>
-			<string name="Sale Mixed">
-			Mixed Sale
-			</string>
-		</panel>
-
-<!-- Object sub-tab -->
-
-		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-		     label="Object" left="1" mouse_opaque="false" name="Object" width="270">
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="select_single" v_pad="0" width="252">
-				Select only one primitive to edit parameters.
-			</text>
-			<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="left" height="10" left_delta="0"
-			     mouse_opaque="true" name="edit_object" v_pad="0" width="252">
-				Edit object parameters:
-			</text>
-			<check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Locked" left="8" mouse_opaque="true"
-			     name="checkbox locked"
-			     tool_tip="Prevents object from being moved or deleted. Frequently useful during building to avoid unintended edits."
-			     width="123" />
-			<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Physical" left="8" mouse_opaque="true"
-			     name="Physical Checkbox Ctrl"
-			     tool_tip="Allows object to be pushed and affected by gravity" width="123" />
-			<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Temporary" left="8" mouse_opaque="true"
-			     name="Temporary Checkbox Ctrl"
-			     tool_tip="Causes object to be deleted 1 minute after creation." width="123" />
-			<check_box bottom_delta="-18" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Phantom" left="8" mouse_opaque="true"
-			     name="Phantom Checkbox Ctrl"
-			     tool_tip="Causes object to not collide with other objects or avatars"
-			     width="123" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="label position" v_pad="0" width="121">
-				Position (meters)
-			</text>
-			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="X" label_width="10" left="10"
-			     max_val="512" min_val="-256" mouse_opaque="true" name="Pos X"
-			     text_enabled_color="110, 15, 15, 255" width="87" />
-			<spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
-			     max_val="512" min_val="-256" mouse_opaque="true" name="Pos Y"
-			     text_enabled_color="0, 100, 40, 255" width="87" />
-			<spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
-			     max_val="4096" min_val="0" mouse_opaque="true" name="Pos Z"
-			     text_enabled_color="0, 67, 132, 255" width="87" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="label size" v_pad="0" width="121">
-				Size (meters)
-			</text>
-			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="X" label_width="10" left="10"
-			     max_val="10" min_val="0.01" mouse_opaque="true" name="Scale X"
-			     text_enabled_color="1, 1, 1, 1" width="87" />
-			<spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="Y" label_width="10" left="10"
-			     max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Y"
-			     text_enabled_color="1, 1, 1, 1" width="87" />
-			<spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="Z" label_width="10" left="10"
-			     max_val="10" min_val="0.01" mouse_opaque="true" name="Scale Z"
-			     text_enabled_color="1, 1, 1, 1" width="87" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="label rotation" v_pad="0" width="121">
-				Rotation (degrees)
-			</text>
-			<spinner bottom_delta="-22" decimal_digits="2" follows="left|top" height="16"
-			     increment="1" initial_val="0" label="X" label_width="10" left="10"
-			     max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot X"
-			     text_enabled_color="1, 1, 1, 1" width="87" />
-			<spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
-			     increment="1" initial_val="0" label="Y" label_width="10" left="10"
-			     max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Y"
-			     text_enabled_color="1, 1, 1, 1" width="87" />
-			<spinner bottom_delta="-18" decimal_digits="2" follows="left|top" height="16"
-			     increment="1" initial_val="0" label="Z" label_width="10" left="10"
-			     max_val="9999" min_val="-9999" mouse_opaque="true" name="Rot Z"
-			     text_enabled_color="1, 1, 1, 1" width="87" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-16" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="label material" v_pad="0" width="121">
-				Material
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-			     left="10" max_chars="20" mouse_opaque="true" name="material" width="87">
-				<combo_item name="Stone" value="Stone">
-					Stone
-				</combo_item>
-				<combo_item name="Metal" value="Metal">
-					Metal
-				</combo_item>
-				<combo_item name="Glass" value="Glass">
-					Glass
-				</combo_item>
-				<combo_item name="Wood" value="Wood">
-					Wood
-				</combo_item>
-				<combo_item name="Flesh" value="Flesh">
-					Flesh
-				</combo_item>
-				<combo_item name="Plastic" value="Plastic">
-					Plastic
-				</combo_item>
-				<combo_item name="Rubber" value="Rubber">
-					Rubber
-				</combo_item>
-			</combo_box>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-36" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="label basetype" v_pad="0" width="141">
-				Building Block Type
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
-			     left="121" max_chars="20" mouse_opaque="true" name="comboBaseType"
-			     width="141">
-				<combo_item name="Box" value="Box">
-					Box
-				</combo_item>
-				<combo_item name="Cylinder" value="Cylinder">
-					Cylinder
-				</combo_item>
-				<combo_item name="Prism" value="Prism">
-					Prism
-				</combo_item>
-				<combo_item name="Sphere" value="Sphere">
-					Sphere
-				</combo_item>
-				<combo_item name="Torus" value="Torus">
-					Torus
-				</combo_item>
-				<combo_item name="Tube" value="Tube">
-					Tube
-				</combo_item>
-				<combo_item name="Ring" value="Ring">
-					Ring
-				</combo_item>
-				<combo_item name="Sculpted" value="Sculpted">
-					Sculpted
-				</combo_item>
-			</combo_box>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="text cut" v_pad="0" width="141">
-				Path Cut Begin and End
-			</text>
-			<spinner bottom_delta="-22" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" label="B" label_width="10" left="121"
-			     max_val="0.98" min_val="0" mouse_opaque="true" name="cut begin" width="68" />
-			<spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.05" initial_val="1" label="E" label_width="10" left_delta="73"
-			     max_val="1" min_val="0.02" mouse_opaque="true" name="cut end" width="68" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="text hollow" v_pad="0" width="68">
-				Hollow
-			</text>
-			<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="left" height="10" left_delta="78"
-			     mouse_opaque="true" name="text skew" v_pad="0" width="63">
-				Skew
-			</text>
-			<spinner bottom_delta="-20" decimal_digits="1" follows="left|top" height="16"
-			     increment="5" initial_val="0" left="121" max_val="95" min_val="0"
-			     mouse_opaque="true" name="Scale 1" width="68" />
-			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" left_delta="73" max_val="0.95"
-			     min_val="-0.95" mouse_opaque="true" name="Skew" width="68" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-15" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="Hollow Shape" v_pad="0" width="141">
-				Hollow Shape
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
-			     left="121" max_chars="20" mouse_opaque="true" name="hole" width="141">
-				<combo_item name="Default" value="Default">
-					Default
-				</combo_item>
-				<combo_item name="Circle" value="Circle">
-					Circle
-				</combo_item>
-				<combo_item name="Square" value="Square">
-					Square
-				</combo_item>
-				<combo_item name="Triangle" value="Triangle">
-					Triangle
-				</combo_item>
-			</combo_box>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="text twist" v_pad="0" width="141">
-				Twist Begin and End
-			</text>
-			<spinner bottom_delta="-22" decimal_digits="0" follows="left|top" height="16"
-			     increment="9" initial_val="0" label="B" label_width="10" left="121"
-			     max_val="180" min_val="-180" mouse_opaque="true" name="Twist Begin"
-			     width="68" />
-			<spinner bottom_delta="0" decimal_digits="0" follows="left|top" height="16"
-			     increment="9" initial_val="0" label="E" label_width="10" left_delta="73"
-			     max_val="180" min_val="-180" mouse_opaque="true" name="Twist End"
-			     width="68" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="scale_taper" v_pad="0" width="141">
-				Taper
-			</text>
-			<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="left" height="10" left="121"
-			     mouse_opaque="true" name="scale_hole" v_pad="0" width="141">
-				Hole Size
-			</text>
-			<spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" label="X" label_width="10" left="121"
-			     max_val="1" min_val="-1" mouse_opaque="true" name="Taper Scale X"
-			     width="68" />
-			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
-			     max_val="1" min_val="-1" mouse_opaque="true" name="Taper Scale Y"
-			     width="68" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="text topshear" v_pad="0" width="141">
-				Top Shear
-			</text>
-			<spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" label="X" label_width="10" left="121"
-			     max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear X" width="68" />
-			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
-			     max_val="0.5" min_val="-0.5" mouse_opaque="true" name="Shear Y" width="68" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="advanced_cut" v_pad="0" width="141">
-				Profile Cut Begin and End
-			</text>
-			<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="left" height="10" left_delta="0"
-			     mouse_opaque="true" name="advanced_dimple" v_pad="0" width="141">
-				Dimple Begin and End
-			</text>
-			<spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" label="B" label_width="10" left="121"
-			     max_val="0.95" min_val="0" mouse_opaque="true" name="Path Limit Begin"
-			     width="68" />
-			<spinner bottom_delta="0" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.05" initial_val="1" label="E" label_width="10" left_delta="73"
-			     max_val="1" min_val="0.05" mouse_opaque="true" name="Path Limit End"
-			     width="68" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-14" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="text taper2" v_pad="0" width="141">
-				Taper
-			</text>
-			<spinner bottom_delta="-19" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" label="X" label_width="10" left="121"
-			     max_val="1" min_val="-1" mouse_opaque="true" name="Taper X" width="68" />
-			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" label="Y" label_width="10" left_delta="73"
-			     max_val="1" min_val="-1" mouse_opaque="true" name="Taper Y" width="68" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="121"
-			     mouse_opaque="true" name="text radius delta" v_pad="0" width="78">
-				Radius
-			</text>
-			<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="left" height="10" left_delta="73"
-			     mouse_opaque="true" name="text revolutions" v_pad="0" width="68">
-				Revolutions
-			</text>
-			<spinner bottom_delta="-19" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.05" initial_val="0" left="121" max_val="1" min_val="-1"
-			     mouse_opaque="true" name="Radius Offset" width="68" />
-			<spinner bottom_delta="0" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.1" initial_val="1" left_delta="73" max_val="4" min_val="1"
-			     mouse_opaque="true" name="Revolutions" width="68" />
-			<texture_picker allow_no_texture="false" bottom="-211" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="141"
-			     label="Sculpt Texture" left="121" mouse_opaque="true"
-			     name="sculpt texture control" tool_tip="Click to choose a picture"
-			     visible="false" width="141" />
-			<check_box bottom_delta="-24" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Mirror" left="121" mouse_opaque="true"
-			     name="sculpt mirror control" visible="false"
-			     tool_tip="Flips sculpted prim along the X axis."
-			     width="121" />
-			<check_box bottom_delta="-20" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Inside-out" left="121" mouse_opaque="true"
-			     name="sculpt invert control" visible="false"
-			     tool_tip="Inverts the sculpted prims normals, making it appear inside-out."
-			     width="121" />
-			<text align="left" bg_visible="false" border_drop_shadow_visible="false"
-			     border_visible="false" bottom_delta="-20" drop_shadow_visible="true"
-			     follows="left|top" font="SansSerifSmall" h_pad="0" height="10" left="121"
-			     mouse_opaque="true" name="label sculpt type" v_pad="0" visible="false"
-			     width="121">
-				Stitching type
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-24" follows="left|top" height="18"
-			     left="121" max_chars="20" mouse_opaque="true" name="sculpt type control"
-			     visible="false" width="141">
-				<combo_item name="None" value="None">
-					(none)
-				</combo_item>
-				<combo_item name="Sphere" value="Sphere">
-					Sphere
-				</combo_item>
-				<combo_item name="Torus" value="Torus">
-					Torus
-				</combo_item>
-				<combo_item name="Plane" value="Plane">
-					Plane
-				</combo_item>
-				<combo_item name="Cylinder" value="Cylinder">
-					Cylinder
-				</combo_item>
-			</combo_box>
-		</panel>
-
-<!-- Features sub-tab -->
-
-		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-		     label="Features" left="1" mouse_opaque="false" name="Features" width="270">
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-20" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="select_single" v_pad="0" width="252">
-				Select only one primitive to edit features.
-			</text>
-			<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="left" height="10" left="10"
-			     mouse_opaque="true" name="edit_object" v_pad="0" width="252">
-				Edit object features:
-			</text>
-			<check_box bottom_delta="-26" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Flexible Path" left="10" mouse_opaque="true"
-			     name="Flexible1D Checkbox Ctrl"
-			     tool_tip="Allows object to flex about the Z axis. (Client-side only)"
-			     width="121" />
-			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     increment="1" initial_val="2" label="Softness" label_width="65" left="10"
-			     max_val="3" min_val="0" mouse_opaque="true" name="FlexNumSections"
-			     width="128" />
-			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.5" initial_val="0.3" label="Gravity" label_width="65"
-			     left="10" max_val="10" min_val="-10" mouse_opaque="true" name="FlexGravity"
-			     width="128" />
-			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.5" initial_val="2" label="Drag" label_width="65" left="10"
-			     max_val="10" min_val="0" mouse_opaque="true" name="FlexFriction"
-			     width="128" />
-			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.5" initial_val="0" label="Wind" label_width="65" left="10"
-			     max_val="10" min_val="0" mouse_opaque="true" name="FlexWind" width="128" />
-			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.5" initial_val="1" label="Tension" label_width="65" left="10"
-			     max_val="10" min_val="0" mouse_opaque="true" name="FlexTension" width="128" />
-			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="Force X" label_width="65" left="10"
-			     max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceX"
-			     width="128" />
-			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="Force Y" label_width="65" left="10"
-			     max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceY"
-			     width="128" />
-			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.01" initial_val="0" label="Force Z" label_width="65" left="10"
-			     max_val="10" min_val="-10" mouse_opaque="true" name="FlexForceZ"
-			     width="128" />
-			<check_box bottom_delta="-30" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Light" left="10" mouse_opaque="true"
-			     name="Light Checkbox Ctrl" tool_tip="Causes object to emit light"
-			     width="121" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-21" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left_delta="0"
-			     mouse_opaque="true" name="label color" v_pad="0" width="58">
-				Color
-			</text>
-			<color_swatch border_color="0.45098, 0.517647, 0.607843, 1" bottom_delta="-28"
-			     can_apply_immediately="true" color="0.5, 0.5, 0.5, 1" follows="left|top"
-			     height="48" label="" left_delta="67" mouse_opaque="true" name="colorswatch"
-			     tool_tip="Click to open Color Picker" width="32" />
-			<spinner bottom_delta="-4" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.1" initial_val="0.5" label="Intensity" label_width="65"
-			     left="10" max_val="1" min_val="0" mouse_opaque="true"
-			     name="Light Intensity" width="128" />
-			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.1" initial_val="5" label="Radius" label_width="65"
-			     left_delta="0" max_val="20" min_val="0" mouse_opaque="true"
-			     name="Light Radius" width="128" />
-			<spinner bottom_delta="-20" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.25" initial_val="1" label="Falloff" label_width="65"
-			     left_delta="0" max_val="2" min_val="0" mouse_opaque="true"
-			     name="Light Falloff" width="128" />
-		</panel>
-
-<!-- Texture sub-tab -->
-
-		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-		     label="Texture" left="1" mouse_opaque="false" name="Texture" width="270">
-			<texture_picker allow_no_texture="false" bottom="-90" can_apply_immediately="true"
-			     default_image_name="Default" follows="left|top" height="80" label="Texture"
-			     left="10" 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="-90"
-			     can_apply_immediately="true" color="1, 1, 1, 1" follows="left|top"
-			     height="80" label="Color" left_delta="90" mouse_opaque="true"
-			     name="colorswatch" tool_tip="Click to open Color Picker" width="64" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-11" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"
-			     mouse_opaque="true" name="color trans" v_pad="0" width="80">
-				Transparency %
-			</text>
-			<spinner bottom_delta="-20" decimal_digits="0" follows="left|top" height="16"
-			     increment="2" initial_val="0" left="180" max_val="90" min_val="0"
-			     mouse_opaque="true" name="ColorTrans" width="80" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom_delta="-12" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10"
-			     left="180" mouse_opaque="true" name="glow label" v_pad="0" width="80">
-				Glow
-			</text>
-			<spinner bottom_delta="-20" decimal_digits="2" follows="left|top" height="16"
-			     increment="0.1" initial_val="0" left="180" max_val="1"
-			     min_val="0" mouse_opaque="true" name="glow" width="80" />
-			<check_box bottom_delta="-23" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Full Bright" left="180" mouse_opaque="true"
-			     name="checkbox fullbright" width="81" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-104" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="tex gen" v_pad="0" width="90">
-				Mapping
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-			     left="10" max_chars="20" mouse_opaque="true" name="combobox texgen"
-			     width="80">
-				<combo_item name="Default" value="Default">
-					Default
-				</combo_item>
-				<combo_item name="Planar" value="Planar">
-					Planar
-				</combo_item>
-			</combo_box>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-104" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="100"
-			     mouse_opaque="true" name="label shininess" v_pad="0" width="70">
-				Shininess
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-			     left="100" max_chars="20" mouse_opaque="true" name="combobox shininess"
-			     width="70">
-				<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>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-104" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="180"
-			     mouse_opaque="true" name="label bumpiness" v_pad="0" width="80">
-				Bumpiness
-			</text>
-			<combo_box allow_text_entry="false" bottom_delta="-22" follows="left|top" height="18"
-			     left="180" max_chars="20" mouse_opaque="true" name="combobox bumpiness"
-			     width="80">
-				<combo_item name="None" value="None">
-					None
-				</combo_item>
-				<combo_item name="Brightness" value="Brightness">
-					Brightness
-				</combo_item>
-				<combo_item name="Darkness" value="Darkness">
-					Darkness
-				</combo_item>
-				<combo_item name="woodgrain" value="woodgrain">
-					woodgrain
-				</combo_item>
-				<combo_item name="bark" value="bark">
-					bark
-				</combo_item>
-				<combo_item name="bricks" value="bricks">
-					bricks
-				</combo_item>
-				<combo_item name="checker" value="checker">
-					checker
-				</combo_item>
-				<combo_item name="concrete" value="concrete">
-					concrete
-				</combo_item>
-				<combo_item name="crustytile" value="crustytile">
-					crustytile
-				</combo_item>
-				<combo_item name="cutstone" value="cutstone">
-					cutstone
-				</combo_item>
-				<combo_item name="discs" value="discs">
-					discs
-				</combo_item>
-				<combo_item name="gravel" value="gravel">
-					gravel
-				</combo_item>
-				<combo_item name="petridish" value="petridish">
-					petridish
-				</combo_item>
-				<combo_item name="siding" value="siding">
-					siding
-				</combo_item>
-				<combo_item name="stonetile" value="stonetile">
-					stonetile
-				</combo_item>
-				<combo_item name="stucco" value="stucco">
-					stucco
-				</combo_item>
-				<combo_item name="suction" value="suction">
-					suction
-				</combo_item>
-				<combo_item name="weave" value="weave">
-					weave
-				</combo_item>
-			</combo_box>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-158" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="tex scale" v_pad="0" width="160">
-				Repeats per Face
-			</text>
-			<spinner bottom="-178" decimal_digits="3" follows="left|top" height="16" increment="0.1"
-			     initial_val="0" label="Horizontal (U)" label_width="90" left="20"
-			     max_val="100" min_val="0" mouse_opaque="true" name="TexScaleU" width="160" />
-			<check_box bottom="-179" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
-			     name="checkbox flip s" width="70" />
-			<spinner bottom="-196" decimal_digits="3" follows="left|top" height="16" increment="0.1"
-			     initial_val="0" label="Vertical (V)" label_width="90" left="20"
-			     max_val="100" min_val="0" mouse_opaque="true" name="TexScaleV" width="160" />
-			<check_box bottom="-197" follows="left|top" font="SansSerifSmall" height="16"
-			     initial_value="false" label="Flip" left_delta="170" mouse_opaque="true"
-			     name="checkbox flip t" width="70" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-228" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="tex rotate" v_pad="0" width="102">
-				Rotation (degrees)
-			</text>
-			<spinner bottom="-234" decimal_digits="2" follows="left|top" height="16" increment="1"
-			     initial_val="0" left="112" max_val="9999" min_val="-9999"
-			     mouse_opaque="true" name="TexRot" width="68" />
-			<string name="string repeats per meter">
-				Repeats Per Meter
-			</string>
-			<string name="string repeats per face">
-				Repeats Per Face
-			</string>
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-250" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="rpt" v_pad="0" width="160">
-				Repeats Per Meter
-			</text>
-			<spinner bottom="-256" decimal_digits="1" follows="left|top" height="16" increment="0.1"
-			     initial_val="1" left="112" max_val="10" min_val="0.1" mouse_opaque="true"
-			     name="rptctrl" width="68" />
-			<button bottom="-256" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" label="Apply" label_selected="Apply" left_delta="78"
-			     mouse_opaque="true" name="button apply" scale_image="TRUE" width="75" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-288" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="10" left="10"
-			     mouse_opaque="true" name="tex offset" v_pad="0" width="160">
-				Offset
-			</text>
-			<spinner bottom="-308" decimal_digits="3" follows="left|top" height="16" increment="0.1"
-			     initial_val="0" label="Horizontal (U)" label_width="90" left="20"
-			     max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetU" width="160" />
-			<spinner bottom_delta="-18" decimal_digits="3" follows="left|top" height="16"
-			     increment="0.1" initial_val="0" label="Vertical (V)" label_width="90"
-			     left="20" max_val="1" min_val="-1" mouse_opaque="true" name="TexOffsetV"
-			     width="160" />
-			<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-			     bottom="-352" drop_shadow_visible="true" follows="left|top"
-			     font="SansSerifSmall" h_pad="0" halign="left" height="20" left="10"
-			     mouse_opaque="true" name="textbox autofix" v_pad="0" width="160">
-				Align media texture
-(must load first)
-			</text>
-			<button bottom="-360" follows="left|top" font="SansSerifSmall" halign="center"
-			     height="16" label="Align" label_selected="Align" left="112"
-			     mouse_opaque="true" name="button align" scale_image="TRUE" width="68" />
-		</panel>
-		<panel border="true" bottom="-383" follows="left|top|right|bottom" height="367"
-		     label="Content" left="1" mouse_opaque="false" name="Contents" width="270">
-			<button bottom="-30" follows="left|top" font="SansSerif" halign="center" height="20"
-			      label="New Script..." label_selected="New Script..."
-			     left="10" mouse_opaque="true" name="button new script" scale_image="TRUE"
-			     width="130" />
-			<panel bottom_delta="-330" follows="left|top" height="325"  left="10"
-			     mouse_opaque="true" name="ContentsInventory" width="252" />
-		</panel>
-	</tab_container>
-
-<!-- Land Info sub-tab -->
-
-	<panel bottom="-550" follows="left|top" height="384" left="0" mouse_opaque="true"
-	     name="land info panel" width="272">
-		<text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
-		     bottom="-18" drop_shadow_visible="true" follows="left|top"
-		     font="SansSerifSmall" h_pad="0" halign="left" height="16" left="4"
-		     mouse_opaque="true" name="label_area_price" v_pad="0" width="150">
-			Price: L$[PRICE] for [AREA] sq. m.
-		</text>
-		<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="left" height="16" left="4"
-		     mouse_opaque="true" name="label_area" v_pad="0" width="128">
-			Area: [AREA] sq. m.
-		</text>
-		<button bottom_delta="-38" follows="left|top" font="SansSerif" halign="center"
-		     height="20" label="Buy Land..." label_selected="Buy Land..." left="76"
-		     mouse_opaque="true" name="button buy land" scale_image="TRUE" width="102" />
-		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-		     height="20" label="Abandon Land..." label_selected="Abandon Land..."
-		     left="76" mouse_opaque="true" name="button abandon land" scale_image="TRUE"
-		     width="102" />
-		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-		     height="20" label="Subdivide..." label_selected="Subdivide..." left="76"
-		     mouse_opaque="true" name="button subdivide land" scale_image="TRUE"
-		     width="102" />
-		<button bottom_delta="-24" follows="left|top" font="SansSerif" halign="center"
-		     height="20" label="Join..." label_selected="Join..." left="76"
-		     mouse_opaque="true" name="button join land" scale_image="TRUE" width="102" />
-		<button bottom_delta="-40" follows="left|top" font="SansSerif" halign="center"
-		     height="20" label="About Land..." label_selected="About Land..." left="76"
-		     mouse_opaque="true" name="button about land" scale_image="TRUE" width="102" />
-	</panel>
-	<string name="status_rotate">
-		Drag colored bands to rotate object
-	</string>
-	<string name="status_scale">
-		Click and drag to stretch selected side
-	</string>
-	<string name="status_move">
-		Drag to move, shift-drag to copy
-	</string>
-	<string name="status_modifyland">
-		Click and hold to modify land
-	</string>
-	<string name="status_camera">
-		Click and drag to change view
-	</string>
-	<string name="status_grab">
-		Drag to move objects, Ctrl to lift, Ctrl-Shift to spin
-	</string>
-	<string name="status_place">
-		Click in the world to create, shift-click to select
-	</string>
-	<string name="status_selectland">
-		Click and drag to select land
-	</string>
-	<string name="grid_screen_text">
-		Screen
-	</string>
-	<string name="grid_local_text">
-		Local
-	</string>
-	<string name="grid_world_text">
-		World
-	</string>
-	<string name="grid_reference_text">
-		Reference
-	</string>
-	<string name="grid_attachment_text">
-		Attachment
-	</string>
-</floater>
-- 
cgit v1.1


From 8b85536ecd3d7a15cdc72652084d1f7b4ce9cfe4 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Tue, 18 Nov 2008 19:21:09 -0600
Subject: Likely fix for VWR-9358 (palletized textures).

Suggested by Angus Boyd.
---
 ChangeLog.txt                  | 7 +++++++
 linden/indra/llrender/llgl.cpp | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f0a359d..97b3af0 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
+2008-11-18  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* linden/indra/llrender/llgl.cpp:
+	Likely fix for VWR-9358 (palletized textures).
+	Suggested by Angus Boyd.
+
+
 2008-11-16  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* linden/indra/newview/skins/silver/xui/en-us/floater_tools.xml:
diff --git a/linden/indra/llrender/llgl.cpp b/linden/indra/llrender/llgl.cpp
index 843bc79..2cb7adc 100644
--- a/linden/indra/llrender/llgl.cpp
+++ b/linden/indra/llrender/llgl.cpp
@@ -578,7 +578,7 @@ void LLGLManager::initExtensions()
 #else // LL_MESA_HEADLESS
 	mHasMultitexture = glh_init_extensions("GL_ARB_multitexture");
 	mHasMipMapGeneration = glh_init_extensions("GL_SGIS_generate_mipmap");
-	mHasPalettedTextures = glh_init_extension("GL_EXT_paletted_texture");
+	mHasPalettedTextures = glh_init_extensions("GL_EXT_paletted_texture");
 	mHasSeparateSpecularColor = glh_init_extensions("GL_EXT_separate_specular_color");
 	mHasAnisotropic = glh_init_extensions("GL_EXT_texture_filter_anisotropic");
 	glh_init_extensions("GL_ARB_texture_cube_map");
-- 
cgit v1.1


From 05411bfd47f328065a8eaeec46397733d782487a Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Tue, 18 Nov 2008 19:25:59 -0600
Subject: Fix VWR-9507: bad typedef breaks build on gcc 4.3.

Suggested by Alissa Sabre.
---
 ChangeLog.txt                    | 5 +++++
 linden/indra/llrender/llrender.h | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 97b3af0..ea45401 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
 2008-11-18  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+	* linden/indra/llrender/llrender.h:
+	Fix VWR-9507: bad typedef breaks build on gcc 4.3.
+	Suggested by Alissa Sabre.
+
+
 	* linden/indra/llrender/llgl.cpp:
 	Likely fix for VWR-9358 (palletized textures).
 	Suggested by Angus Boyd.
diff --git a/linden/indra/llrender/llrender.h b/linden/indra/llrender/llrender.h
index 15360a3..ef495ed 100644
--- a/linden/indra/llrender/llrender.h
+++ b/linden/indra/llrender/llrender.h
@@ -214,7 +214,7 @@ public:
 
 	LLTexUnit* getTexUnit(U32 index);
 
-	typedef struct Vertex
+	struct Vertex
 	{
 		GLfloat v[3];
 		GLubyte c[4];
-- 
cgit v1.1


From a202d4b0fadf3b4466b8cc06b41a11d767e1008d Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Tue, 18 Nov 2008 19:43:52 -0600
Subject: VWR-9007: Group UI uses "Person" instead of "Resident".

---
 ChangeLog.txt                                                     | 8 ++++++++
 .../indra/newview/skins/default/xui/en-us/panel_group_invite.xml  | 4 ++--
 .../indra/newview/skins/default/xui/en-us/panel_group_roles.xml   | 2 +-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index ea45401..9449172 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,11 @@
+2008-11-18  McCabe Maxsted  <hakushakukun@gmail.com>
+
+	* linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml:
+	VWR-9007: Group UI uses "Person" instead of "Resident".
+	* linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml:
+	Ditto.
+
+
 2008-11-18  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* linden/indra/llrender/llrender.h:
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml
index 8c5cbb5..74d71f4 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml
@@ -4,10 +4,10 @@
 	<text bottom_delta="-78" height="54" left="7" width="200" name="help_text">
 		You can select multiple residents to 
 invite to your group. Click &apos;Open 
-Person Chooser&apos; to start.
+Resident Chooser&apos; to start.
 	</text>
 	<button bottom_delta="-10" font="SansSerifSmall" halign="center" height="20"
-	     label="Open Person Chooser" left="5" name="add_button" tool_tip=""
+	     label="Open Resident Chooser" left="5" name="add_button" tool_tip=""
 	     width="200" />
 	<name_list allow_calling_card_drop="true" background_visible="true" bottom_delta="-178"
 	     column_padding="0" draw_border="true" height="174" left="5"
diff --git a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
index 53f847a..bd64622 100644
--- a/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/panel_group_roles.xml
@@ -80,7 +80,7 @@ execute the Ability.
 				<column label="Last Login" name="online" width="116" />
 			</name_list>
 			<button bottom_delta="-20" font="SansSerif" halign="center" height="19"
-			     label="Invite New Person ..." left="4" name="member_invite" width="146" />
+			     label="Invite New Member ..." left="4" name="member_invite" width="146" />
 			<button bottom_delta="0" font="SansSerif" halign="center" height="19"
 			     label="Eject From Group" left="-153" name="member_eject" width="146" />
 			<string name="help_text">
-- 
cgit v1.1


From 6717a2be0c720ffb349ad3ae6eb0aab5020d4b3d Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Tue, 18 Nov 2008 21:26:23 -0600
Subject: Changed app dir (for cache, etc.) to Imprudence.

---
 ChangeLog.txt                                | 12 ++++++++++++
 linden/indra/llcrashlogger/llcrashlogger.cpp |  4 ++--
 linden/indra/llvfs/lldir.cpp                 |  2 +-
 linden/indra/llvfs/lldir_mac.cpp             |  4 ++--
 linden/indra/newview/llappviewer.cpp         |  4 ++--
 5 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9449172..2e090b4 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,15 @@
+2008-11-18  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* linden/indra/llcrashlogger/llcrashlogger.cpp: 
+	Changed app dir (for cache, etc.) to Imprudence.
+	* linden/indra/llvfs/lldir.cpp: 
+	Ditto.
+	* linden/indra/llvfs/lldir_mac.cpp: 
+	Ditto.
+	* linden/indra/newview/llappviewer.cpp: 
+	Ditto.
+
+
 2008-11-18  McCabe Maxsted  <hakushakukun@gmail.com>
 
 	* linden/indra/newview/skins/default/xui/en-us/panel_group_invite.xml:
diff --git a/linden/indra/llcrashlogger/llcrashlogger.cpp b/linden/indra/llcrashlogger/llcrashlogger.cpp
index b9a182c..2fffc7f 100755
--- a/linden/indra/llcrashlogger/llcrashlogger.cpp
+++ b/linden/indra/llcrashlogger/llcrashlogger.cpp
@@ -327,9 +327,9 @@ void LLCrashLogger::updateApplication(const std::string& message)
 bool LLCrashLogger::init()
 {
 	// We assume that all the logs we're looking for reside on the current drive
-	gDirUtilp->initAppDirs("SecondLife");
+	gDirUtilp->initAppDirs("Imprudence");
 
-	// Default to the product name "Second Life" (this is overridden by the -name argument)
+	// Default to the product name "Imprudence" (this is overridden by the -name argument)
 	mProductName = "Imprudence";
 	
 	mCrashSettings.declareS32(CRASH_BEHAVIOR_SETTING, CRASH_BEHAVIOR_ASK, "Controls behavior when viewer crashes "
diff --git a/linden/indra/llvfs/lldir.cpp b/linden/indra/llvfs/lldir.cpp
index 0e014d9..8cd2b5c 100644
--- a/linden/indra/llvfs/lldir.cpp
+++ b/linden/indra/llvfs/lldir.cpp
@@ -229,7 +229,7 @@ const std::string  LLDir::getCacheDir(bool get_default) const
 		}
 		else
 		{
-			res = getOSCacheDir() + mDirDelimiter + "SecondLife";
+			res = getOSCacheDir() + mDirDelimiter + "Imprudence";
 		}
 		return res;
 	}
diff --git a/linden/indra/llvfs/lldir_mac.cpp b/linden/indra/llvfs/lldir_mac.cpp
index fd8f087..548f3da 100644
--- a/linden/indra/llvfs/lldir_mac.cpp
+++ b/linden/indra/llvfs/lldir_mac.cpp
@@ -121,7 +121,7 @@ LLDir_Mac::LLDir_Mac()
 	CFStringRef		stringRef = NULL;
 	OSStatus		error = noErr;
 	FSRef			fileRef;
-	CFStringRef		secondLifeString = CFSTR("SecondLife");
+	CFStringRef		secondLifeString = CFSTR("Imprudence");
 	
 	mainBundleRef = CFBundleGetMainBundle();
 		
@@ -172,7 +172,7 @@ LLDir_Mac::LLDir_Mac()
 		if (error == noErr)
 		{
 			FSRefToLLString(&cacheDirRef, mOSCacheDir);
-			(void)CFCreateDirectory(&cacheDirRef, CFSTR("SecondLife"),NULL);
+			(void)CFCreateDirectory(&cacheDirRef, CFSTR("Imprudence"),NULL);
 		}
 		
 		// mOSUserAppDir
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 5fd5575..6301421 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -580,7 +580,7 @@ bool LLAppViewer::init()
 	
 	// Need to do this initialization before we do anything else, since anything
 	// that touches files should really go through the lldir API
-	gDirUtilp->initAppDirs("SecondLife");
+	gDirUtilp->initAppDirs(IMP_VIEWER_NAME);
 	// set skin search path to default, will be overridden later
 	// this allows simple skinned file lookups to work
 	gDirUtilp->setSkinFolder("default");
@@ -2688,7 +2688,7 @@ bool LLAppViewer::initCache()
 			std::string cache_dir = gDirUtilp->getOSUserAppDir();
 			std::string new_cache_dir = gDirUtilp->getOSCacheDir();
 			cache_dir = cache_dir + "/cache";
-			new_cache_dir = new_cache_dir + "/SecondLife";
+			new_cache_dir = new_cache_dir + "/" + gSecondLife;
 			if (gDirUtilp->fileExists(cache_dir))
 			{
 				gDirUtilp->setCacheDir(cache_dir);
-- 
cgit v1.1


From 317612f9e2adb134bb3006621c81d40c3508f776 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Tue, 18 Nov 2008 22:01:48 -0600
Subject: Changed to Imprudence.exec_marker to match llappviewer.cpp.

---
 ChangeLog.txt                                | 4 ++++
 linden/indra/llcrashlogger/llcrashlogger.cpp | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2e090b4..15d5e13 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,10 @@
 2008-11-18  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* linden/indra/llcrashlogger/llcrashlogger.cpp: 
+	Changed to Imprudence.exec_marker to match llappviewer.cpp.
+
+
+	* linden/indra/llcrashlogger/llcrashlogger.cpp: 
 	Changed app dir (for cache, etc.) to Imprudence.
 	* linden/indra/llvfs/lldir.cpp: 
 	Ditto.
diff --git a/linden/indra/llcrashlogger/llcrashlogger.cpp b/linden/indra/llcrashlogger/llcrashlogger.cpp
index 2fffc7f..af30136 100755
--- a/linden/indra/llcrashlogger/llcrashlogger.cpp
+++ b/linden/indra/llcrashlogger/llcrashlogger.cpp
@@ -341,7 +341,7 @@ bool LLCrashLogger::init()
 	//Run through command line options
 	if(getOption("previous").isDefined())
 	{
-		llinfos << "Previous execution did not remove SecondLife.exec_marker" << llendl;
+		llinfos << "Previous execution did not remove Imprudence.exec_marker" << llendl;
 		mCrashInPreviousExec = TRUE;
 	}
 
@@ -371,7 +371,7 @@ bool LLCrashLogger::init()
 	//If we've opened the crash logger, assume we can delete the marker file if it exists	
 	if( gDirUtilp )
 	{
-		std::string marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"SecondLife.exec_marker");
+		std::string marker_file = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"Imprudence.exec_marker");
 		ll_apr_file_remove( marker_file );
 	}
 	
-- 
cgit v1.1


From a8112de9df4cf80fadeed323a477fedd7581930b Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Fri, 21 Nov 2008 15:47:30 -0600
Subject: Likely fix for VWR-8920 (disappearing attachments).

From http://svn.secondlife.com/trac/linden/changeset/1393
---
 ChangeLog.txt                       | 7 +++++++
 linden/indra/newview/lldrawable.cpp | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 15d5e13..9b3e11c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
+2008-11-21  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* linden/indra/newview/lldrawable.cpp:
+	Likely fix for VWR-8920 (disappearing attachments).
+	From http://svn.secondlife.com/trac/linden/changeset/1393
+
+
 2008-11-18  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* linden/indra/llcrashlogger/llcrashlogger.cpp: 
diff --git a/linden/indra/newview/lldrawable.cpp b/linden/indra/newview/lldrawable.cpp
index 0f89585..5e4aafc 100644
--- a/linden/indra/newview/lldrawable.cpp
+++ b/linden/indra/newview/lldrawable.cpp
@@ -951,6 +951,9 @@ BOOL LLDrawable::isVisible() const
 		return TRUE;
 	}
 	
+#if 0
+	//disabling this code fixes DEV-20105.  Leaving in place in case some other bug pops up as a a result.
+	//should be safe to just always ask the spatial group for visibility.
 	if (isActive())
 	{
 		if (isRoot())
@@ -973,6 +976,7 @@ BOOL LLDrawable::isVisible() const
 		}
 	}
 	else
+#endif
 	{
 		LLSpatialGroup* group = getSpatialGroup();
 		if (group && group->isVisible())
-- 
cgit v1.1


From 265113e2c2a89826611ec61ba9ad37590d9a13bf Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Mon, 24 Nov 2008 18:11:26 -0600
Subject: Changed the grid selector options at login.

Renamed "Agni" to "SL Main Grid", etc. and removed private
LL grids from the list. Also added "Local OpenSim" option.
---
 ChangeLog.txt                            | 12 +++++
 linden/indra/newview/llpanellogin.cpp    | 64 +-------------------------
 linden/indra/newview/llviewernetwork.cpp | 78 ++++----------------------------
 linden/indra/newview/llviewernetwork.h   | 15 ------
 4 files changed, 23 insertions(+), 146 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 9b3e11c..8bee793 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,15 @@
+2008-11-24  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* linden/indra/newview/llpanellogin.cpp: 
+	Changed the grid selector options at login.
+	Renamed "Agni" to "SL Main Grid", etc. and removed private
+	LL grids from the list. Also added "Local OpenSim" option.
+	* linden/indra/newview/llviewernetwork.cpp: 
+	Ditto.
+	* linden/indra/newview/llviewernetwork.h: 
+	Ditto.
+
+
 2008-11-21  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* linden/indra/newview/lldrawable.cpp:
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 61bf215..86dab63 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -134,74 +134,14 @@ void LLLoginHandler::parse(const LLSD& queryMap)
 	mLastName = queryMap["last_name"].asString();
 	
 	EGridInfo grid_choice = GRID_INFO_NONE;
-	if (queryMap["grid"].asString() == "aditi")
+	if (queryMap["grid"].asString() == "sl beta grid")
 	{
 		grid_choice = GRID_INFO_ADITI;
 	}
-	else if (queryMap["grid"].asString() == "agni")
+	else if (queryMap["grid"].asString() == "sl main grid")
 	{
 		grid_choice = GRID_INFO_AGNI;
 	}
-	else if (queryMap["grid"].asString() == "siva")
-	{
-		grid_choice = GRID_INFO_SIVA;
-	}
-	else if (queryMap["grid"].asString() == "damballah")
-	{
-		grid_choice = GRID_INFO_DAMBALLAH;
-	}
-	else if (queryMap["grid"].asString() == "durga")
-	{
-		grid_choice = GRID_INFO_DURGA;
-	}
-	else if (queryMap["grid"].asString() == "shakti")
-	{
-		grid_choice = GRID_INFO_SHAKTI;
-	}
-	else if (queryMap["grid"].asString() == "soma")
-	{
-		grid_choice = GRID_INFO_SOMA;
-	}
-	else if (queryMap["grid"].asString() == "ganga")
-	{
-		grid_choice = GRID_INFO_GANGA;
-	}
-	else if (queryMap["grid"].asString() == "vaak")
-	{
-		grid_choice = GRID_INFO_VAAK;
-	}
-	else if (queryMap["grid"].asString() == "uma")
-	{
-		grid_choice = GRID_INFO_UMA;
-	}
-	else if (queryMap["grid"].asString() == "mohini")
-	{
-		grid_choice = GRID_INFO_MOHINI;
-	}
-	else if (queryMap["grid"].asString() == "yami")
-	{
-		grid_choice = GRID_INFO_YAMI;
-	}
-	else if (queryMap["grid"].asString() == "nandi")
-	{
-		grid_choice = GRID_INFO_NANDI;
-	}
-	else if (queryMap["grid"].asString() == "mitra")
-	{
-		grid_choice = GRID_INFO_MITRA;
-	}
-	else if (queryMap["grid"].asString() == "radha")
-	{
-		grid_choice = GRID_INFO_RADHA;
-	}
-	else if (queryMap["grid"].asString() == "ravi")
-	{
-		grid_choice = GRID_INFO_RAVI;
-	}
-	else if (queryMap["grid"].asString() == "aruna")
-	{
-		grid_choice = GRID_INFO_ARUNA;
-	}
 
 	if(grid_choice != GRID_INFO_NONE)
 	{
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 13d432a..7d1d351 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -46,81 +46,21 @@ struct LLGridData
 static LLGridData gGridInfo[GRID_INFO_COUNT] = 
 {
 	{ "None", "", "", ""},
-	{ "Aditi", 
-	  "util.aditi.lindenlab.com", 
+	{ "SL Beta Grid",
+	  "util.aditi.lindenlab.com",
 	  "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
 	  "http://aditi-secondlife.webdev.lindenlab.com/helpers/" },
-	{ "Agni", 
+	{ "SL Main Grid",
 	  "util.agni.lindenlab.com", 
 	  "https://login.agni.lindenlab.com/cgi-bin/login.cgi",
 	  "https://secondlife.com/helpers/" },
-	{ "Aruna",
-	  "util.aruna.lindenlab.com",
-	  "https://login.aruna.lindenlab.com/cgi-bin/login.cgi",
-	  "http://aruna-secondlife.webdev.lindenlab.com/helpers/" },
-	{ "Damballah",
-	  "util.damballah.lindenlab.com",
-	  "https://login.damballah.lindenlab.com/cgi-bin/login.cgi",
-	  "http://damballah-secondlife.webdev.lindenlab.com/helpers/" },
-	{ "Durga",
-	  "util.durga.lindenlab.com",
-	  "https://login.durga.lindenlab.com/cgi-bin/login.cgi",
-	  "http://durga-secondlife.webdev.lindenlab.com/helpers/" },
-	{ "Ganga",
-	  "util.ganga.lindenlab.com",
-	  "https://login.ganga.lindenlab.com/cgi-bin/login.cgi",
-	  "http://ganga-secondlife.webdev.lindenlab.com/helpers/" },
-	{ "Mitra",
-	  "util.mitra.lindenlab.com",
-	  "https://login.mitra.lindenlab.com/cgi-bin/login.cgi",
-	  "http://mitra-secondlife.webdev.lindenlab.com/helpers/" },
-	{ "Mohini",
-	  "util.mohini.lindenlab.com",
-	  "https://login.mohini.lindenlab.com/cgi-bin/login.cgi",
-	  "http://mohini-secondlife.webdev.lindenlab.com/helpers/" },
-  	{ "Nandi",
-	  "util.nandi.lindenlab.com",
-	  "https://login.nandi.lindenlab.com/cgi-bin/login.cgi",
-	  "http://nandi-secondlife.webdev.lindenlab.com/helpers/" },
-	{ "Radha",
-	  "util.radha.lindenlab.com",
-	  "https://login.radha.lindenlab.com/cgi-bin/login.cgi",
-	  "http://radha-secondlife.webdev.lindenlab.com/helpers/" },
-	{ "Ravi",
-	  "util.ravi.lindenlab.com",
-	  "https://login.ravi.lindenlab.com/cgi-bin/login.cgi",
-	  "http://ravi-secondlife.webdev.lindenlab.com/helpers/" },
-	{ "Siva", 
-	  "util.siva.lindenlab.com",
-	  "https://login.siva.lindenlab.com/cgi-bin/login.cgi",
-	  "http://siva-secondlife.webdev.lindenlab.com/helpers/" },
-	{ "Shakti",
-	  "util.shakti.lindenlab.com",
-	  "https://login.shakti.lindenlab.com/cgi-bin/login.cgi",
-	  "http://shakti-secondlife.webdev.lindenlab.com/helpers/" },
-	{ "Soma",
-	  "util.soma.lindenlab.com",
-	  "https://login.soma.lindenlab.com/cgi-bin/login.cgi",
-	  "http://soma-secondlife.webdev.lindenlab.com/helpers/" },
-	{ "Uma",
-	  "util.uma.lindenlab.com",
-	  "https://login.uma.lindenlab.com/cgi-bin/login.cgi",
-	  "http://uma-secondlife.webdev.lindenlab.com/helpers/" },
-	{ "Vaak",
-	  "util.vaak.lindenlab.com",
-	  "https://login.vaak.lindenlab.com/cgi-bin/login.cgi",
-	  "http://vaak-secondlife.webdev.lindenlab.com/helpers/" },
-	{ "Yami",
-	  "util.yami.lindenlab.com",
-	  "https://login.yami.lindenlab.com/cgi-bin/login.cgi",
-	  "http://yami-secondlife.webdev.lindenlab.com/helpers/" },
-	{ "Local", 
-	  "localhost", 
-	  "https://login.dmz.lindenlab.com/cgi-bin/login.cgi",
+	{ "Local OpenSim",
+	  "localhost",
+	  "http://0.0.0.0:9000",
 	  "" },
-	{ "Other", 
-	  "", 
-	  "https://login.dmz.lindenlab.com/cgi-bin/login.cgi",
+	{ "Other",
+	  "",
+	  "",
 	  "" }
 };
 
diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h
index 53bb0ab..e39507d 100644
--- a/linden/indra/newview/llviewernetwork.h
+++ b/linden/indra/newview/llviewernetwork.h
@@ -40,21 +40,6 @@ enum EGridInfo
 	GRID_INFO_NONE,
 	GRID_INFO_ADITI,
 	GRID_INFO_AGNI,
-	GRID_INFO_ARUNA,
-	GRID_INFO_DAMBALLAH,
-	GRID_INFO_DURGA,
-	GRID_INFO_GANGA,
-	GRID_INFO_MITRA,
-	GRID_INFO_MOHINI,
-	GRID_INFO_NANDI,
-	GRID_INFO_RADHA,
-	GRID_INFO_RAVI,
-	GRID_INFO_SIVA,
-	GRID_INFO_SHAKTI,
-	GRID_INFO_SOMA,
-	GRID_INFO_UMA,
-	GRID_INFO_VAAK,
-	GRID_INFO_YAMI,
 	GRID_INFO_LOCAL,
 	GRID_INFO_OTHER, // IP address set via command line option
 	GRID_INFO_COUNT
-- 
cgit v1.1


From c07a4170324b61fc51e38ec72d44b26a52fc326e Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Tue, 25 Nov 2008 18:18:52 -0600
Subject: Added "code name" field for grid selections.

The code name is used to fetch the proper splash page.
This decouples the user-visible label from the name
expected by the SL web server.
---
 ChangeLog.txt                            | 13 +++++++++++++
 linden/indra/newview/llpanellogin.cpp    |  2 +-
 linden/indra/newview/llviewernetwork.cpp | 21 ++++++++++++++++-----
 linden/indra/newview/llviewernetwork.h   | 14 ++++++++++++++
 4 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 8bee793..193b965 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,16 @@
+2008-11-25  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* linden/indra/newview/llpanellogin.cpp:
+	Added "code name" field for grid selections.
+	The code name is used to fetch the proper splash page.
+	This decouples the user-visible label from the name
+	expected by the SL web server.
+	* linden/indra/newview/llviewernetwork.cpp:
+	Ditto.
+	* linden/indra/newview/llviewernetwork.h:
+	Ditto.
+
+
 2008-11-24  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* linden/indra/newview/llpanellogin.cpp: 
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 86dab63..1dff8e7 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -877,7 +877,7 @@ void LLPanelLogin::loadLoginPage()
 	curl_free(curl_version);
 
 	// Grid
-	char* curl_grid = curl_escape(LLViewerLogin::getInstance()->getGridLabel().c_str(), 0);
+	char* curl_grid = curl_escape(LLViewerLogin::getInstance()->getGridCodeName().c_str(), 0);
 	oStr << "&grid=" << curl_grid;
 	curl_free(curl_grid);
 
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 7d1d351..7fb19af 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -38,6 +38,7 @@
 struct LLGridData
 {
 	const char* mLabel;
+  const char* mCodeName;
 	const char* mName;
 	const char* mLoginURI;
 	const char* mHelperURI;
@@ -45,23 +46,23 @@ struct LLGridData
 
 static LLGridData gGridInfo[GRID_INFO_COUNT] = 
 {
-	{ "None", "", "", ""},
+	{ "None", "", "", "", "" },
 	{ "SL Beta Grid",
+	  "Aditi",
 	  "util.aditi.lindenlab.com",
 	  "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
 	  "http://aditi-secondlife.webdev.lindenlab.com/helpers/" },
 	{ "SL Main Grid",
+	  "Agni",
 	  "util.agni.lindenlab.com", 
 	  "https://login.agni.lindenlab.com/cgi-bin/login.cgi",
 	  "https://secondlife.com/helpers/" },
 	{ "Local OpenSim",
+	  "",
 	  "localhost",
 	  "http://0.0.0.0:9000",
 	  "" },
-	{ "Other",
-	  "",
-	  "",
-	  "" }
+	{ "Other", "", "", "", "" }
 };
 
 const EGridInfo DEFAULT_GRID_CHOICE = GRID_INFO_AGNI;
@@ -160,6 +161,16 @@ std::string LLViewerLogin::getGridLabel() const
 	return mGridName;
 }
 
+std::string LLViewerLogin::getGridCodeName() const
+{
+	if( gGridInfo[mGridChoice].mCodeName == "" )
+	{
+		return getGridLabel();
+	}
+
+	return gGridInfo[mGridChoice].mCodeName;
+}
+
 std::string LLViewerLogin::getKnownGridLabel(EGridInfo grid_index) const
 {
 	if(grid_index > GRID_INFO_NONE && grid_index < GRID_INFO_OTHER)
diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h
index e39507d..39ac879 100644
--- a/linden/indra/newview/llviewernetwork.h
+++ b/linden/indra/newview/llviewernetwork.h
@@ -72,6 +72,20 @@ public:
 	**/
 	std::string getGridLabel() const; 
 
+  /**
+   * @brief Get the code name for the grid choice.
+   *
+   * Returns the code name for the grid choice, as designated
+   * by Linden Lab. The SL main grid is Agni, and the beta
+   * grid is Aditi. There are other LL testing grids with code
+   * names, but we don't care about those.
+   *
+   * This string is used primarily for fetching the proper
+   * login splash page, since the web server expects "Agni"
+   * and "Aditi", not "SL Main Grid" and "SL Beta Grid".
+   */
+	std::string getGridCodeName() const; 
+
 	std::string getKnownGridLabel(EGridInfo grid_index) const; 
 
 	void getLoginURIs(std::vector<std::string>& uris) const;
-- 
cgit v1.1


From 06352713b3b9de3a9040710577614df95f25457d Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Tue, 25 Nov 2008 18:58:24 -0600
Subject: Rearranged grid selectors so main grid is first.

---
 ChangeLog.txt                            |  8 ++++++++
 linden/indra/newview/llstartup.cpp       |  2 +-
 linden/indra/newview/llviewernetwork.cpp | 10 +++++-----
 linden/indra/newview/llviewernetwork.h   |  2 +-
 4 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 193b965..dd99b55 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,13 @@
 2008-11-25  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+	* linden/indra/newview/llstartup.cpp:
+	Rearranged grid selectors so main grid is first.
+	* linden/indra/newview/llviewernetwork.cpp:
+	Ditto.
+	* linden/indra/newview/llviewernetwork.cpp:
+	Ditto.
+
+
 	* linden/indra/newview/llpanellogin.cpp:
 	Added "code name" field for grid selections.
 	The code name is used to fetch the proper splash page.
diff --git a/linden/indra/newview/llstartup.cpp b/linden/indra/newview/llstartup.cpp
index 0978fbb..625b1d8 100644
--- a/linden/indra/newview/llstartup.cpp
+++ b/linden/indra/newview/llstartup.cpp
@@ -2462,7 +2462,7 @@ void login_show()
 	LLPanelLogin::addServer(LLViewerLogin::getInstance()->getGridLabel(), LLViewerLogin::getInstance()->getGridChoice());
 
 	LLViewerLogin* vl = LLViewerLogin::getInstance();
-	for(int grid_index = GRID_INFO_ADITI; grid_index < GRID_INFO_OTHER; ++grid_index)
+	for(int grid_index = GRID_INFO_NONE + 1; grid_index < GRID_INFO_OTHER; ++grid_index)
 	{
 		LLPanelLogin::addServer(vl->getKnownGridLabel((EGridInfo)grid_index), grid_index);
 	}
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 7fb19af..5b423ff 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -47,16 +47,16 @@ struct LLGridData
 static LLGridData gGridInfo[GRID_INFO_COUNT] = 
 {
 	{ "None", "", "", "", "" },
-	{ "SL Beta Grid",
-	  "Aditi",
-	  "util.aditi.lindenlab.com",
-	  "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
-	  "http://aditi-secondlife.webdev.lindenlab.com/helpers/" },
 	{ "SL Main Grid",
 	  "Agni",
 	  "util.agni.lindenlab.com", 
 	  "https://login.agni.lindenlab.com/cgi-bin/login.cgi",
 	  "https://secondlife.com/helpers/" },
+	{ "SL Beta Grid",
+	  "Aditi",
+	  "util.aditi.lindenlab.com",
+	  "https://login.aditi.lindenlab.com/cgi-bin/login.cgi",
+	  "http://aditi-secondlife.webdev.lindenlab.com/helpers/" },
 	{ "Local OpenSim",
 	  "",
 	  "localhost",
diff --git a/linden/indra/newview/llviewernetwork.h b/linden/indra/newview/llviewernetwork.h
index 39ac879..970e2ce 100644
--- a/linden/indra/newview/llviewernetwork.h
+++ b/linden/indra/newview/llviewernetwork.h
@@ -38,8 +38,8 @@ class LLHost;
 enum EGridInfo
 {
 	GRID_INFO_NONE,
-	GRID_INFO_ADITI,
 	GRID_INFO_AGNI,
+	GRID_INFO_ADITI,
 	GRID_INFO_LOCAL,
 	GRID_INFO_OTHER, // IP address set via command line option
 	GRID_INFO_COUNT
-- 
cgit v1.1


From beb7e12d2af3106a405043ec9e25958bc950b191 Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Sat, 29 Nov 2008 01:10:51 -0700
Subject: Fixed search window not refreshing in RelWithDebInfo builds.

---
 ChangeLog.txt                               | 6 ++++++
 linden/indra/newview/llfloaterdirectory.cpp | 4 ----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index dd99b55..f149120 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,9 @@
+2008-11-29  McCabe Maxsted  <hakushakukun@gmail.com>
+
+	* linden/indra/newview/llfloaterdirectory.cpp:
+	Fixed search window not refreshing in RelWithDebInfo builds.
+
+
 2008-11-25  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* linden/indra/newview/llstartup.cpp:
diff --git a/linden/indra/newview/llfloaterdirectory.cpp b/linden/indra/newview/llfloaterdirectory.cpp
index 305a029..9a0c2fc 100644
--- a/linden/indra/newview/llfloaterdirectory.cpp
+++ b/linden/indra/newview/llfloaterdirectory.cpp
@@ -383,10 +383,6 @@ void LLFloaterDirectory::showPanel(const std::string& tabname)
 // static
 void LLFloaterDirectory::toggleFind(void*)
 {
-#ifndef LL_RELEASE_FOR_DOWNLOAD
-	delete sInstance;
-	sInstance = NULL;
-#endif
 	if (!sInstance)
 	{
 		std::string panel = gSavedSettings.getString("LastFindPanel");
-- 
cgit v1.1


From cbf968ee5957d3c31f3c732a56d2164e031aafba Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 29 Nov 2008 12:27:12 -0600
Subject: Stop console window from always showing up.

---
 ChangeLog.txt                        | 6 ++++++
 linden/indra/newview/llappviewer.cpp | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f149120..ead1066 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,9 @@
+2008-11-29  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* linden/indra/newview/llappviewer.cpp:
+	Stop console window from always showing up.
+
+
 2008-11-29  McCabe Maxsted  <hakushakukun@gmail.com>
 
 	* linden/indra/newview/llfloaterdirectory.cpp:
diff --git a/linden/indra/newview/llappviewer.cpp b/linden/indra/newview/llappviewer.cpp
index 6301421..243a9d8 100644
--- a/linden/indra/newview/llappviewer.cpp
+++ b/linden/indra/newview/llappviewer.cpp
@@ -1604,11 +1604,6 @@ bool LLAppViewer::initConfiguration()
 
 	gSavedSettings.setString("VersionChannelName", IMP_VIEWER_NAME);
 
-#ifndef	LL_RELEASE_FOR_DOWNLOAD
-        gSavedSettings.setBOOL("ShowConsoleWindow", TRUE);
-        gSavedSettings.setBOOL("AllowMultipleViewers", TRUE);
-#endif
-
 #if !LL_DYNAMIC_FONT_DISCOVERY
 	// static font discovery - user settings can override.
 	gSavedSettings.setString("FontSansSerifFallback",
-- 
cgit v1.1


From a6ac2f6f6d7a368700b02ece913aa213bb3e001c Mon Sep 17 00:00:00 2001
From: McCabe Maxsted
Date: Wed, 19 Nov 2008 15:28:13 -0700
Subject: Fixed inworld browser crash in Windows.

---
 ChangeLog.txt      | 6 ++++++
 linden/install.xml | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index ead1066..7324410 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -50,6 +50,12 @@
 	From http://svn.secondlife.com/trac/linden/changeset/1393
 
 
+2008-11-19  McCabe Maxsted  <hakushakukun@gmail.com>
+
+	* linden/install.xml:
+	Fixed inworld browser crash in Windows.
+
+
 2008-11-18  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* linden/indra/llcrashlogger/llcrashlogger.cpp: 
diff --git a/linden/install.xml b/linden/install.xml
index 216c854..0326b24 100644
--- a/linden/install.xml
+++ b/linden/install.xml
@@ -699,9 +699,9 @@ anguage Infrstructure (CLI) international standard</string>
           <key>windows</key>
           <map>
             <key>md5sum</key>
-            <string>8c1b8881285631eb32ba541e10d07b07</string>
+            <string>42cb780c595d25881b4967292a4a0f40</string>
             <key>url</key>
-            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llmozlib-windows-20080922.tar.bz2</uri>
+            <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llmozlib-windows-20080828.tar.bz2</uri>
           </map>
         </map>
       </map>
-- 
cgit v1.1


From ab87675230ce6139f57b5f19af66599ada9e270e Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 29 Nov 2008 21:19:57 -0600
Subject: Remove preprocessor condition for grid selector.

The grid selector on the login screen will always show,
instead of only showing when the viewer was compiled
as LL_RELEASE_FOR_DOWNLOAD.
---
 ChangeLog.txt                         | 7 +++++++
 linden/indra/newview/llpanellogin.cpp | 5 -----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 7324410..88829c9 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,12 @@
 2008-11-29  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+	* linden/indra/newview/llpanellogin.cpp:
+	Remove preprocessor condition for grid selector.
+	The grid selector on the login screen will always show,
+	instead of only showing when the viewer was compiled
+	as LL_RELEASE_FOR_DOWNLOAD.
+
+
 	* linden/indra/newview/llappviewer.cpp:
 	Stop console window from always showing up.
 
diff --git a/linden/indra/newview/llpanellogin.cpp b/linden/indra/newview/llpanellogin.cpp
index 1dff8e7..09e2cee 100644
--- a/linden/indra/newview/llpanellogin.cpp
+++ b/linden/indra/newview/llpanellogin.cpp
@@ -789,12 +789,7 @@ void LLPanelLogin::refreshLocation( bool force_visible )
 	sInstance->childSetVisible("start_location_combo", show_start);
 	sInstance->childSetVisible("start_location_text", show_start);
 
-#if LL_RELEASE_FOR_DOWNLOAD
-	BOOL show_server = gSavedSettings.getBOOL("ForceShowGrid");
-	sInstance->childSetVisible("server_combo", show_server);
-#else
 	sInstance->childSetVisible("server_combo", TRUE);
-#endif
 
 #endif
 }
-- 
cgit v1.1


From a97da2c607517551faef928353813b8456bfcc53 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 30 Nov 2008 13:33:02 -0600
Subject: Fixed passing nonliteral strings to *printf functions.

gcc 4.3 rejects that as being unsafe.
Patch by Stephen Zenith. [#11]
---
 ChangeLog.txt                                          | 12 ++++++++++++
 linden/indra/linux_crash_logger/llcrashloggerlinux.cpp |  2 +-
 linden/indra/llwindow/llwindowsdl.cpp                  |  2 +-
 linden/indra/lscript/lscript_compile/lscript_tree.cpp  |  8 ++++----
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 88829c9..2e4f19b 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,15 @@
+2008-11-30  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* linden/indra/llwindow/llwindowsdl.cpp:
+	Fixed passing nonliteral strings to *printf functions.
+	gcc 4.3 rejects that as being unsafe.
+	Patch by Stephen Zenith. [#11]
+	* linden/indra/linux_crash_logger/llcrashloggerlinux.cpp:
+	Ditto.
+	* linden/indra/lscript/lscript_compile/lscript_tree.cpp: 
+	Ditto.
+
+
 2008-11-29  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* linden/indra/newview/llpanellogin.cpp:
diff --git a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
index 6ac9831..c4294d6 100644
--- a/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
+++ b/linden/indra/linux_crash_logger/llcrashloggerlinux.cpp
@@ -90,7 +90,7 @@ static BOOL do_ask_dialog(void)
 
 	win = gtk_message_dialog_new(NULL,
 				     flags, messagetype, buttons,
-				     dialog_text);
+				     "%s", dialog_text);
 	gtk_window_set_type_hint(GTK_WINDOW(win),
 				 GDK_WINDOW_TYPE_HINT_DIALOG);
 	gtk_window_set_title(GTK_WINDOW(win), dialog_title);
diff --git a/linden/indra/llwindow/llwindowsdl.cpp b/linden/indra/llwindow/llwindowsdl.cpp
index c088dd8..f0acee5 100644
--- a/linden/indra/llwindow/llwindowsdl.cpp
+++ b/linden/indra/llwindow/llwindowsdl.cpp
@@ -2530,7 +2530,7 @@ S32 OSMessageBoxSDL(const std::string& text, const std::string& caption, U32 typ
 			buttons = GTK_BUTTONS_YES_NO;
 			break;
 		}
-		win = gtk_message_dialog_new(NULL,flags, messagetype, buttons, text.c_str());
+		win = gtk_message_dialog_new(NULL,flags, messagetype, buttons, "%s", text.c_str());
 
 # if LL_X11
 		// Make GTK tell the window manager to associate this
diff --git a/linden/indra/lscript/lscript_compile/lscript_tree.cpp b/linden/indra/lscript/lscript_compile/lscript_tree.cpp
index 71e7f19..70d8195 100644
--- a/linden/indra/lscript/lscript_compile/lscript_tree.cpp
+++ b/linden/indra/lscript/lscript_compile/lscript_tree.cpp
@@ -7885,10 +7885,10 @@ void LLScriptFunctionCall::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
 			{
 				// Prefix function name with g to distinguish from
 				// event handlers.
-				fprintf(fp, gScriptp->getClassName());
+				fprintf(fp, "%s", gScriptp->getClassName());
 				fprintf(fp, "::'g");
 			}
-			fprintf(fp, mIdentifier->mName);
+			fprintf(fp, "%s", mIdentifier->mName);
 			fprintf(fp, "'(");
 			print_cil_arg_list(fp, mIdentifier->mScopeEntry->mFunctionArgs);
 			fprintf(fp, ")\n");
@@ -9720,7 +9720,7 @@ void LLScriptEventHandler::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPTCom
 		// Allows state changing by finding handlers prefixed with new
 		// state name. Prefix disambiguates functions and event handlers.
 		fprintf(fp, "e");
-		fprintf(fp, entry->mIdentifier);
+		fprintf(fp, "%s", entry->mIdentifier);
 
 		// Handler name and arguments.
 		mEventp->recurse(fp, tabs, tabsize, pass, ptype, prunearg, scope, type, basetype, count, chunk, heap, stacksize, entry, entrycount, NULL);
@@ -10152,7 +10152,7 @@ void LLScriptGlobalFunctions::recurse(LLFILE *fp, S32 tabs, S32 tabsize, LSCRIPT
 			fprintf(fp, ".method public hidebysig instance default ");
 			print_cil_type(fp, mType ? mType->mType : LST_NULL);
 			fprintf(fp, " 'g");
-			fprintf(fp, mIdentifier->mName);
+			fprintf(fp, "%s", mIdentifier->mName);
 			fprintf(fp, "'");
 			if (mParameters)
 			{
-- 
cgit v1.1


From aff35cae3d5c3f0f4a2798498464914f3a922a91 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sun, 30 Nov 2008 13:39:21 -0600
Subject: Disable llmozlib-dependent code when not available.

Patch by Stephen Zenith. [#12]
---
 ChangeLog.txt                           | 5 +++++
 linden/indra/llmedia/llmediamanager.cpp | 2 ++
 2 files changed, 7 insertions(+)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 2e4f19b..6c7008c 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
 2008-11-30  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+	* linden/indra/llmedia/llmediamanager.cpp:
+	Disable llmozlib-dependent code when not available.
+	Patch by Stephen Zenith. [#12]
+
+
 	* linden/indra/llwindow/llwindowsdl.cpp:
 	Fixed passing nonliteral strings to *printf functions.
 	gcc 4.3 rejects that as being unsafe.
diff --git a/linden/indra/llmedia/llmediamanager.cpp b/linden/indra/llmedia/llmediamanager.cpp
index f72e63c..16c731f 100644
--- a/linden/indra/llmedia/llmediamanager.cpp
+++ b/linden/indra/llmedia/llmediamanager.cpp
@@ -150,8 +150,10 @@ LLMediaManager* LLMediaManager::getInstance()
 // (static)
 void LLMediaManager::setBrowserUserAgent(std::string user_agent)
 {
+#if LL_LLMOZLIB_ENABLED
 	// *HACK: Breaks encapsulation model, as initClass does above. JC
 	LLMediaImplLLMozLib::setBrowserUserAgent(user_agent);
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////////////////
-- 
cgit v1.1


From 47f7a7ca951ea888be7da23d874641523a1e67c8 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 4 Dec 2008 02:02:18 -0600
Subject: Imprudence 1.0.0 RC2 released.

---
 ChangeLog.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 6c7008c..ee1067a 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,8 @@
+2008-12-04  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* Imprudence 1.0.0 RC2 released.
+
+
 2008-11-30  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* linden/indra/llmedia/llmediamanager.cpp:
-- 
cgit v1.1


From b01f7b6bf6ac26f040177f845477936aa0697b2d Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Thu, 4 Dec 2008 15:30:43 -0600
Subject: Use 127.0.0.1 for local opensim, not 0.0.0.0.

---
 ChangeLog.txt                            | 4 ++++
 linden/indra/newview/llviewernetwork.cpp | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index ee1067a..29859e1 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -3,6 +3,10 @@
 	* Imprudence 1.0.0 RC2 released.
 
 
+	* linden/indra/newview/llviewernetwork.cpp:
+	Use 127.0.0.1 for local opensim, not 0.0.0.0.
+
+
 2008-11-30  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* linden/indra/llmedia/llmediamanager.cpp:
diff --git a/linden/indra/newview/llviewernetwork.cpp b/linden/indra/newview/llviewernetwork.cpp
index 5b423ff..c8cffcf 100644
--- a/linden/indra/newview/llviewernetwork.cpp
+++ b/linden/indra/newview/llviewernetwork.cpp
@@ -60,7 +60,7 @@ static LLGridData gGridInfo[GRID_INFO_COUNT] =
 	{ "Local OpenSim",
 	  "",
 	  "localhost",
-	  "http://0.0.0.0:9000",
+	  "http://127.0.0.1:9000",
 	  "" },
 	{ "Other", "", "", "", "" }
 };
-- 
cgit v1.1


From 636460bd7a18c1b621b096ad55a80a5b49320775 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 6 Dec 2008 11:47:18 -0600
Subject: VWR-10759 (use delete [] in LLMediaImplGStreamer)

Patch by Aleric Inglewood.
---
 ChangeLog.txt                                 | 7 +++++++
 linden/indra/llmedia/llmediaimplgstreamer.cpp | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 29859e1..7ca5d3b 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,10 @@
+2008-12-06  Jacek Antonelli  <jacek.antonelli@gmail.com>
+
+	* linden/indra/llmedia/llmediaimplgstreamer.cpp:
+	VWR-10759 (use delete [] in LLMediaImplGStreamer)
+	Patch by Aleric Inglewood.
+
+
 2008-12-04  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* Imprudence 1.0.0 RC2 released.
diff --git a/linden/indra/llmedia/llmediaimplgstreamer.cpp b/linden/indra/llmedia/llmediaimplgstreamer.cpp
index 51a5bca..5d6a648 100644
--- a/linden/indra/llmedia/llmediaimplgstreamer.cpp
+++ b/linden/indra/llmedia/llmediaimplgstreamer.cpp
@@ -428,7 +428,7 @@ unload ()
 
 	if (mediaData)
 	{
-		delete mediaData;
+		delete [] mediaData;
 		mediaData = NULL;
 	}
 
-- 
cgit v1.1


From 16ec76454eba3143e98434adab731cc71ad5ee0b Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 6 Dec 2008 11:50:22 -0600
Subject: VWR-10837 (use delete [] in LLImageTGA)

Patch by Aleric Inglewood.
---
 ChangeLog.txt                       | 5 +++++
 linden/indra/llimage/llimagetga.cpp | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 7ca5d3b..533bddd 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
 2008-12-06  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+	* linden/indra/llimage/llimagetga.cpp:
+	VWR-10837 (use delete [] in LLImageTGA)
+	Patch by Aleric Inglewood.
+
+
 	* linden/indra/llmedia/llmediaimplgstreamer.cpp:
 	VWR-10759 (use delete [] in LLMediaImplGStreamer)
 	Patch by Aleric Inglewood.
diff --git a/linden/indra/llimage/llimagetga.cpp b/linden/indra/llimage/llimagetga.cpp
index 32c2111..21d0fd1 100644
--- a/linden/indra/llimage/llimagetga.cpp
+++ b/linden/indra/llimage/llimagetga.cpp
@@ -104,7 +104,7 @@ LLImageTGA::LLImageTGA(const std::string& file_name)
 
 LLImageTGA::~LLImageTGA()
 {
-	delete mColorMap;
+	delete [] mColorMap;
 }
 
 BOOL LLImageTGA::updateData()
-- 
cgit v1.1


From 6718a49a75c861336d272082b1af46b5910f89ad Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 6 Dec 2008 11:53:58 -0600
Subject: VWR-9400 (memleak whenever an LSL script is uploaded)

Patch by Carjay McGinnis.
---
 ChangeLog.txt                           | 5 +++++
 linden/indra/llmessage/llhttpclient.cpp | 7 +++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index 533bddd..f9baad6 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,10 @@
 2008-12-06  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+	* linden/indra/llmessage/llhttpclient.cpp:
+	VWR-9400 (memleak whenever an LSL script is uploaded)
+	Patch by Carjay McGinnis.
+
+
 	* linden/indra/llimage/llimagetga.cpp:
 	VWR-10837 (use delete [] in LLImageTGA)
 	Patch by Aleric Inglewood.
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index fc2612f..6242bda 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -160,10 +160,9 @@ namespace
 				fstream.seekg(0, std::ios::end);
 				U32 fileSize = fstream.tellg();
 				fstream.seekg(0, std::ios::beg);
-				char* fileBuffer;
-				fileBuffer = new char [fileSize];
-				fstream.read(fileBuffer, fileSize);
-				ostream.write(fileBuffer, fileSize);
+				std::vector<char> fileBuffer(fileSize);
+				fstream.read(&fileBuffer[0], fileSize);
+				ostream.write(&fileBuffer[0], fileSize);
 				fstream.close();
 				eos = true;
 				return STATUS_DONE;
-- 
cgit v1.1


From 20c9dc0a1da2cd57716796ae97adcd4d018213da Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 6 Dec 2008 12:00:05 -0600
Subject: VWR-9400-patch2 (memleak whenever an LSL script is uploaded)

Patch by Henri Beauchamp.
---
 ChangeLog.txt                           | 5 +++++
 linden/indra/llmessage/llhttpclient.cpp | 7 +++----
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index f9baad6..d6a7ee1 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,6 +1,11 @@
 2008-12-06  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* linden/indra/llmessage/llhttpclient.cpp:
+	VWR-9400b (memleak whenever an LSL script is uploaded)
+	Patch by Henri Beauchamp.
+
+
+	* linden/indra/llmessage/llhttpclient.cpp:
 	VWR-9400 (memleak whenever an LSL script is uploaded)
 	Patch by Carjay McGinnis.
 
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index 6242bda..ef163fa 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -189,10 +189,9 @@ namespace
 			
 			LLVFile vfile(gVFS, mUUID, mAssetType, LLVFile::READ);
 			S32 fileSize = vfile.getSize();
-			U8* fileBuffer;
-			fileBuffer = new U8 [fileSize];
-            vfile.read(fileBuffer, fileSize);
-            ostream.write((char*)fileBuffer, fileSize);
+			std::vector<U8> fileBuffer(fileSize);
+			vfile.read(&fileBuffer[0], fileSize);
+			ostream.write((char*)&fileBuffer[0], fileSize);
 			eos = true;
 			return STATUS_DONE;
 		}
-- 
cgit v1.1


From 925975639a2438bc9bdf43a0ceaab1c4555052b0 Mon Sep 17 00:00:00 2001
From: Jacek Antonelli
Date: Sat, 6 Dec 2008 20:47:39 -0600
Subject: Added banners in ChangeLog to set versions apart.

Entries should be placed in the section for the
version into which they were merged. Entries within
a section should be sorted chronologically.

This is important for keeping track of changes which
weren't merged until a later release than they were
written. (Mixing them in chronologically would cause
confusion about which changes were included in a
release.)
---
 ChangeLog.txt | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/ChangeLog.txt b/ChangeLog.txt
index d6a7ee1..148f6fb 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,5 +1,19 @@
 2008-12-06  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
+	* ChangeLog:
+	Added banners in ChangeLog to set versions apart.
+	
+	Entries should be placed in the section for the
+	version into which they were merged. Entries within
+	a section should be sorted chronologically.
+
+	This is important for keeping track of changes which
+	weren't merged until a later release than they were 
+	written. (Mixing them in chronologically would cause
+	confusion about which changes were included in a
+	release.)
+
+
 	* linden/indra/llmessage/llhttpclient.cpp:
 	VWR-9400b (memleak whenever an LSL script is uploaded)
 	Patch by Henri Beauchamp.
@@ -20,6 +34,11 @@
 	Patch by Aleric Inglewood.
 
 
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+=-                       1.0.0 RC2                        -=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+
 2008-12-04  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* Imprudence 1.0.0 RC2 released.
@@ -156,6 +175,11 @@
 	and position. It will now correctly inherit from default skin.
 
 
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+=-                       1.0.0 RC1                        -=
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+
+
 2008-11-15  Jacek Antonelli  <jacek.antonelli@gmail.com>
 
 	* Imprudence 1.0.0 RC1 released.
-- 
cgit v1.1