Adding non-volume status to the pathfinding linkset to restrict non-convex linksets from being set to be a material or exclusion volume.

1 files changed, 6 insertions, 13 deletions

diff --git a/indra/newview/llfloaterpathfindinglinksets.h b/indra/newview/llfloaterpathfindinglinksets.h
index d201ffe20b..fdc47e3d40 100644
--- a/indra/newview/llfloaterpathfindinglinksets.h
+++ b/indra/newview/llfloaterpathfindinglinksets.h
@@ -35,8 +35,8 @@
 #include "llpathfindinglinksetlist.h"

 #include "llpathfindingmanager.h"

 

-#include <boost/signals2.hpp>
-
+#include <boost/signals2.hpp>

+

 class LLSD;

 class LLUICtrl;

 class LLTextBase;

@@ -77,14 +77,6 @@ public:
 protected:

 

 private:

-	typedef enum

-	{

-		kAllowLinksetUseAll,

-		kAllowLinksetUseOnlyNonPhantom,

-		kAllowLinksetUseOnlyPhantom,

-		kAllowLinksetUseOnlyTerrain

-	} EAllowLinksetsUse;

-

 	LLLineEditor     *mFilterByName;

 	LLLineEditor     *mFilterByDescription;

 	LLComboBox       *mFilterByLinksetUse;

@@ -122,7 +114,7 @@ private:
 	LLPathfindingLinksetListPtr              mLinksetsListPtr;

 	LLObjectSelectionHandle                  mLinksetsSelection;

 	LLPathfindingManager::agent_state_slot_t mAgentStateSlot;

-	boost::signals2::connection              mSelectionUpdateSlot;
+	boost::signals2::connection              mSelectionUpdateSlot;

 

 	// Does its own instance management, so clients not allowed

 	// to allocate or destroy.

@@ -163,12 +155,13 @@ private:
 	LLSD buildLinksetScrollListElement(const LLPathfindingLinksetPtr pLinksetPtr, const LLVector3 &pAvatarPosition) const;

 	LLSD buildLinksetUseScrollListElement(const std::string &label, S32 value) const;

 

-	EAllowLinksetsUse getAllowLinksetUse() const;

-	bool              doShowLinksetUseSetWarning(LLPathfindingLinkset::ELinksetUse linksetUse) const;

+	bool isShowUnmodifiablePhantomWarning(LLPathfindingLinkset::ELinksetUse linksetUse) const;

+	bool isShowCannotBeVolumeWarning(LLPathfindingLinkset::ELinksetUse linksetUse) const;

 

 	void updateStatusMessage();

 	void updateEnableStateOnListActions();

 	void updateEnableStateOnEditFields();

+	void updateEnableStateOnEditLinksetUse();

 

 	void applyEdit();

 	void handleApplyEdit(const LLSD &pNotification, const LLSD &pResponse);