From 830fa3ebccebea67758b299c5f490d57705bf8c3 Mon Sep 17 00:00:00 2001
From: angela <angela@lindenlab.com>
Date: Tue, 27 Oct 2009 18:06:43 +0800
Subject: disable media title to make it read only at all time

---
 indra/newview/app_settings/settings.xml | 2 +-
 indra/newview/llfloatertools.cpp        | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 3682d48577..718efa9dcb 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -76,7 +76,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>1</integer>
+      <integer>0</integer>
     </map>
     <key>AnimateTextures</key>
     <map>
diff --git a/indra/newview/llfloatertools.cpp b/indra/newview/llfloatertools.cpp
index 92980c22c7..3bec6f9e73 100644
--- a/indra/newview/llfloatertools.cpp
+++ b/indra/newview/llfloatertools.cpp
@@ -1141,7 +1141,7 @@ void LLFloaterTools::getMediaState()
 		childSetEnabled( "edit_media", bool_has_media & editable );
 		childSetEnabled( "delete_media", bool_has_media & editable );
 		childSetEnabled( "add_media", ( ! bool_has_media ) & editable );
-		media_info->setEnabled(bool_has_media & editable);
+		media_info->setEnabled(false);
 			// TODO: display a list of all media on the face - use 'identical' flag
 	}
 	else // not all face has media but at least one does.
@@ -1165,7 +1165,7 @@ void LLFloaterTools::getMediaState()
 			
 		}
 		
-		media_info->setEnabled(TRUE);
+		media_info->setEnabled(false);
 		media_info->setTentative(true);
 		childSetEnabled("media_tex",  TRUE);
 		childSetEnabled( "edit_media", TRUE);
-- 
cgit v1.2.3