From 63e8bb875b6aa3ae7789ee01497b848e9090e435 Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 7 Mar 2012 19:41:49 -0800
Subject: Adding an enabled check for the linksets menu item based on whether
 the state is frozen.

---
 indra/newview/llviewermenu.cpp                     | 11 +++++++++++
 indra/newview/skins/default/xui/en/menu_viewer.xml |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp
index 92a01c22b3..06f9d931f8 100644
--- a/indra/newview/llviewermenu.cpp
+++ b/indra/newview/llviewermenu.cpp
@@ -110,6 +110,7 @@
 #include "lleconomy.h"
 #include "lltoolgrab.h"
 #include "llwindow.h"
+#include "llpathfindingmanager.h"
 #include "boost/unordered_map.hpp"
 
 using namespace LLVOAvatarDefines;
@@ -4752,6 +4753,14 @@ class LLToolsSaveToObjectInventory : public view_listener_t
 	}
 };
 
+class LLToolsEnableLinksets : public view_listener_t
+{
+	bool handleEvent(const LLSD& userdata)
+	{
+		return LLPathfindingManager::getInstance()->isAllowAlterPermanent();
+	}
+};
+
 // Round the position of all root objects to the grid
 class LLToolsSnapObjectXY : public view_listener_t
 {
@@ -8144,6 +8153,8 @@ void initialize_menus()
 	view_listener_t::addMenu(new LLToolsEnableSaveToInventory(), "Tools.EnableSaveToInventory");
 	view_listener_t::addMenu(new LLToolsEnableSaveToObjectInventory(), "Tools.EnableSaveToObjectInventory");
 
+	view_listener_t::addMenu(new LLToolsEnableLinksets(), "Tools.EnableLinksets");
+
 	// Help menu
 	// most items use the ShowFloater method
 	view_listener_t::addMenu(new LLToggleHowTo(), "Help.ToggleHowTo");
diff --git a/indra/newview/skins/default/xui/en/menu_viewer.xml b/indra/newview/skins/default/xui/en/menu_viewer.xml
index 1e4a3fc13c..fb1709f28d 100644
--- a/indra/newview/skins/default/xui/en/menu_viewer.xml
+++ b/indra/newview/skins/default/xui/en/menu_viewer.xml
@@ -963,6 +963,8 @@
           <menu_item_call.on_click
               function="Floater.ToggleOrBringToFront"
               parameter="pathfinding_linksets" />
+          <menu_item_call.on_enable
+              function="Tools.EnableLinksets" />
         </menu_item_call>
         <menu_item_call
             label="Characters..."
-- 
cgit v1.2.3


From 1bbab32bc28b9659f7e39c969cff321cee313b7b Mon Sep 17 00:00:00 2001
From: Todd Stinson <stinson@lindenlab.com>
Date: Wed, 7 Mar 2012 19:53:01 -0800
Subject: Updating to the latest pre-built llphysicsextensions package.

---
 autobuild.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/autobuild.xml b/autobuild.xml
index 5fe11b111d..abeb091e25 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1110,9 +1110,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>b733d165a6f9d4e8f86c5e59233506b5</string>
+              <string>e047a15fc1e5e3d86ffddd6c5d3bac19</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/250739/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120307.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/250814/arch/Darwin/installer/llphysicsextensions-0.1-darwin-20120307.tar.bz2</string>
             </map>
             <key>name</key>
             <string>darwin</string>
@@ -1122,9 +1122,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>0506201f7f48f098600213f5fff29dff</string>
+              <string>0c455d15f4893e561aae1bfd07a6b06c</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/250393/arch/Linux/installer/llphysicsextensions-0.1-linux-20120302.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/250814/arch/Linux/installer/llphysicsextensions-0.1-linux-20120308.tar.bz2</string>
             </map>
             <key>name</key>
             <string>linux</string>
@@ -1134,9 +1134,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>291ecd97538cb6504e1185cb01cc21b8</string>
+              <string>7b65d855746d3fe5daaf845d11f9e723</string>
               <key>url</key>
-              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/250739/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120307.tar.bz2</string>
+              <string>http://s3-proxy.lindenlab.com/private-builds-secondlife-com/hg/repo/stinson_llpathinglibrary/rev/250814/arch/CYGWIN/installer/llphysicsextensions-0.1-windows-20120307.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
-- 
cgit v1.2.3