From 3ba9bd536b036fda89d467729870cfac0c5727b8 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Fri, 7 Oct 2011 12:20:06 -0700
Subject: * "search" floater now only minimized after teleport if it is visible
 to begin   with. * LLAgent now keeps track of whether or not the agent can
 build in the current   parcel. * Hooked up is_enabled_function to build and
 speak commands.

---
 indra/newview/app_settings/commands.xml | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/commands.xml b/indra/newview/app_settings/commands.xml
index 8ee4b7d075..a59642b2d8 100644
--- a/indra/newview/app_settings/commands.xml
+++ b/indra/newview/app_settings/commands.xml
@@ -37,6 +37,8 @@
            tooltip_ref="Command_Build_Tooltip"
            execute_function="Floater.ToolbarToggle"
            execute_parameters="build"
+           is_enabled_function="Agent.IsActionAllowed"
+           is_enabled_parameters="build"
            is_running_function="Floater.IsOpen"
            is_running_parameters="build"
            />
@@ -207,6 +209,8 @@
            tooltip_ref="Command_Speak_Tooltip"
            execute_function="Floater.ToolbarToggle"
            execute_parameters="speak"
+           is_enabled_function="Agent.IsActionAllowed"
+           is_enabled_parameters="speak"
            is_running_function="Floater.IsOpen"
            is_running_parameters="speak"
            />
-- 
cgit v1.3


From 3ce63ffea34daee10ea50a6ca9272d46f2715f05 Mon Sep 17 00:00:00 2001
From: Leslie Linden <leslie@lindenlab.com>
Date: Fri, 7 Oct 2011 12:28:01 -0700
Subject: * Updated to no longer perform user_status marketplace query for DD.
 * Fixed setting to always display the inbox inventory panel.

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

(limited to 'indra/newview/app_settings')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 092e69952c..aa2ff646a8 100644
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4246,7 +4246,7 @@
         <key>Type</key>
         <string>Boolean</string>
         <key>Value</key>
-        <integer>0</integer>
+        <integer>1</integer>
     </map>
     <key>InventoryDisplayOutbox</key>
     <map>
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 13dbc5e386..41b4dc01e8 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1488,7 +1488,8 @@ void LLViewerMedia::setOpenIDCookie()
 			new LLViewerMediaWebProfileResponder(raw_profile_url.getAuthority()),
 			headers);
 
-		doOnetimeEarlyHTTPRequests();
+		// FUI: No longer perform the user_status query
+		//doOnetimeEarlyHTTPRequests();
 	}
 }
 
-- 
cgit v1.3