From 01dd55579a450545b4e9d317a1e3cab6ce57d62c Mon Sep 17 00:00:00 2001
From: Hazim Gazov <hazim.gazov@gmail.com>
Date: Sun, 16 May 2010 02:57:47 -0300
Subject: [PATCH] I'm dumb for breaking head again

---
 indra/newview/llagent.cpp                     | 42 ++++++++++---------
 .../xui/en-us/floater_texture_ctrl.xml        |  8 +++-
 2 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp
index 364b272f0..22b1a3bfe 100644
--- a/indra/newview/llagent.cpp
+++ b/indra/newview/llagent.cpp
@@ -220,17 +220,19 @@ LLAgent gAgent;
 // Statics
 //
 
-// <edit>
-// For MapBlockReply funk 'cause I dunno what I'm doing
-BOOL LLAgent::lure_show = FALSE;
-std::string LLAgent::lure_name;
-LLVector3d LLAgent::lure_posglobal;
-U16 LLAgent::lure_global_x;
-U16 LLAgent::lure_global_y;
-int LLAgent::lure_x;
-int LLAgent::lure_y;
-int LLAgent::lure_z;
-std::string LLAgent::lure_maturity;
+// <edit>
+// For MapBlockReply funk 'cause I dunno what I'm doing
+/* not *quite* there yet, and I don't want to break head.
+BOOL LLAgent::lure_show = FALSE;
+std::string LLAgent::lure_name;
+LLVector3d LLAgent::lure_posglobal;
+U16 LLAgent::lure_global_x;
+U16 LLAgent::lure_global_y;
+int LLAgent::lure_x;
+int LLAgent::lure_y;
+int LLAgent::lure_z;
+std::string LLAgent::lure_maturity;
+*/
 // </edit>
 
 const F32 LLAgent::TYPING_TIMEOUT_SECS = 5.f;
@@ -770,11 +772,11 @@ void LLAgent::movePitch(S32 direction)
 // Does this parcel allow you to fly?
 BOOL LLAgent::canFly()
 {
-	if (isGodlike()) return TRUE;
-
-	// <edit>
-	if(gSavedSettings.getBOOL("AlwaysAllowFly")) return TRUE;
-	// </edit>
+	if (isGodlike()) return TRUE;
+
+	// <edit>
+	if(gSavedSettings.getBOOL("AlwaysAllowFly")) return TRUE;
+	// </edit>
 
 	LLViewerRegion* regionp = getRegion();
 	if (regionp && regionp->getBlockFly()) return FALSE;
@@ -1883,10 +1885,10 @@ void LLAgent::cameraZoomIn(const F32 fraction)
 							 LLWorld::getInstance()->getRegionWidthInMeters() - DIST_FUDGE );
 
 	if (new_distance > max_distance)
-	{
-		// <edit> screw cam constraints
-		//new_distance = max_distance;
-		// </edit>
+	{
+		// <edit> screw cam constraints
+		//new_distance = max_distance;
+		// </edit>
 
 		/*
 		// Unless camera is unlocked
diff --git a/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
index 97b12e04a..b2790ea0d 100644
--- a/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
+++ b/indra/newview/skins/default/xui/en-us/floater_texture_ctrl.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" standalone="yes" ?>
 <floater bottom="-516" can_close="true" can_drag_on_left="false" can_minimize="false"
-     can_resize="true" can_tear_off="true" enabled="true" height="290"
-     left="478" min_height="290" min_width="410" mouse_opaque="true"
+     can_resize="true" can_tear_off="true" enabled="true" height="310"
+     left="478" min_height="310" min_width="410" mouse_opaque="true"
      name="texture picker" title="Pick: Texture" width="410">
 	<string name="choose_picture">
 		Click to choose a picture
@@ -54,6 +54,10 @@
 	<button bottom="-282" enabled="true" follows="right|bottom" font="SansSerif"
 	     halign="center" height="20" label="Select" label_selected="Select"
 	     left="290" mouse_opaque="true" name="Select" scale_image="true" width="100" />
+	<line_editor bevel_style="in" border_style="line" border_thickness="1" bottom_delta="-10"
+	     follows="left|bottom" font="SansSerif" handle_edit_keys_directly="true"
+	     height="20" max_length="36" mouse_opaque="true"
+	     name="texture_uuid" select_all_on_focus_received="false" width="230" />
 	<string name="pick title">
 		Pick:
 	</string>