Pathfinding UI: Hide Capsule doesn't seem to work without havok

indra/newview/llfloaterpathfindingcharacters.cpp

@@ -30,13 +30,16 @@
 
 #include "llfloaterpathfindingcharacters.h"
 
+/* Singu Note: Capsule doesn't seem to work without havok
 #include <string>
 
 #include "llcheckboxctrl.h"
 #include "llfloaterpathfindingobjects.h"
 #include "llhandle.h"
+*/
 #include "llpathfindingcharacter.h"
 #include "llpathfindingcharacterlist.h"
+/* Singu Note: Capsule doesn't seem to work without havok
 #include "llpathfindingmanager.h"
 #include "llpathfindingobject.h"
 #include "llpathfindingobjectlist.h"
@@ -44,18 +47,20 @@
 #include "llquaternion.h"
 #include "llsd.h"
 #include "llui.h"
-#include "lluictrlfactory.h"
 #include "lluuid.h"
 #include "llviewerobject.h"
 #include "llviewerobjectlist.h"
 #include "pipeline.h"
 #include "v3math.h"
 #include "v4color.h"
+*/
+#include "lluictrlfactory.h"
 
 //---------------------------------------------------------------------------
 // LLFloaterPathfindingCharacters
 //---------------------------------------------------------------------------
 
+/* Singu Note: Capsule doesn't seem to work without havok
 void LLFloaterPathfindingCharacters::onClose(bool pIsAppQuitting)
 {
 	// Hide any capsule that might be showing on floater close
@@ -80,6 +85,7 @@ BOOL LLFloaterPathfindingCharacters::isPhysicsCapsuleEnabled(LLUUID& id, LLVecto
 	// parameters for any selected object
 	return (isShowPhysicsCapsule() &&  getCapsuleRenderData(pos, rot ));
 }
+*/
 
 void LLFloaterPathfindingCharacters::openCharactersWithSelectedObjects()
 {
@@ -89,7 +95,7 @@ void LLFloaterPathfindingCharacters::openCharactersWithSelectedObjects()
 
 LLFloaterPathfindingCharacters::LLFloaterPathfindingCharacters(const LLSD& pSeed)
 	: LLFloaterPathfindingObjects(/*pSeed*/),
-	mShowPhysicsCapsuleCheckBox(NULL),
+//	mShowPhysicsCapsuleCheckBox(NULL),
 	mSelectedCharacterId(),
 	mBeaconColor()
 {
@@ -104,10 +110,12 @@ BOOL LLFloaterPathfindingCharacters::postBuild()
 {
 	mBeaconColor = LLUI::sColorsGroup->getColor("PathfindingCharacterBeaconColor");
 
+/* Singu Note: Capsule doesn't seem to work without havok
 	mShowPhysicsCapsuleCheckBox = getChild<LLCheckBoxCtrl>("show_physics_capsule");
 	llassert(mShowPhysicsCapsuleCheckBox != NULL);
 	mShowPhysicsCapsuleCheckBox->setCommitCallback(boost::bind(&LLFloaterPathfindingCharacters::onShowPhysicsCapsuleClicked, this));
 	mShowPhysicsCapsuleCheckBox->setEnabled(LLPathingLib::getInstance() != NULL);
+*/
 
 	return LLFloaterPathfindingObjects::postBuild();
 }
@@ -133,12 +141,14 @@ void LLFloaterPathfindingCharacters::buildObjectsScrollList(const LLPathfindingO
 	}
 }
 
+/* Singu Note: Capsule doesn't seem to work without havok
 void LLFloaterPathfindingCharacters::updateControlsOnScrollListChange()
 {
 	LLFloaterPathfindingObjects::updateControlsOnScrollListChange();
 	updateStateOnDisplayControls();
 	showSelectedCharacterCapsules();
 }
+*/
 
 S32 LLFloaterPathfindingCharacters::getNameColumnIndex() const
 {
@@ -172,6 +182,7 @@ LLPathfindingObjectListPtr LLFloaterPathfindingCharacters::getEmptyObjectList()
 	return objectListPtr;
 }
 
+/* Singu Note: Capsule doesn't seem to work without havok
 void LLFloaterPathfindingCharacters::onShowPhysicsCapsuleClicked()
 {
 	if (LLPathingLib::getInstance() == NULL)
@@ -193,6 +204,7 @@ void LLFloaterPathfindingCharacters::onShowPhysicsCapsuleClicked()
 		}
 	}
 }
+*/
 
 LLSD LLFloaterPathfindingCharacters::buildCharacterScrollListItemData(const LLPathfindingCharacter *pCharacterPtr) const
 {
@@ -221,6 +233,7 @@ LLSD LLFloaterPathfindingCharacters::buildCharacterScrollListItemData(const LLPa
 	return columns;
 }
 
+/* Singu Note: Capsule doesn't seem to work without havok
 void LLFloaterPathfindingCharacters::updateStateOnDisplayControls()
 {
 	int numSelectedItems = getNumSelectedObjects();;
@@ -307,3 +320,4 @@ bool LLFloaterPathfindingCharacters::getCapsuleRenderData(LLVector3& pPosition,
 
 	return result;
 }
+*/

indra/newview/llfloaterpathfindingcharacters.h

@@ -32,21 +32,25 @@
 #include "lluuid.h"
 #include "v4color.h"
 
-class LLCheckBoxCtrl;
+//class LLCheckBoxCtrl;
 class LLPathfindingCharacter;
+/* Singu Note: Capsule doesn't seem to work without havok
 class LLQuaternion;
 class LLSD;
 class LLVector3;
+*/
 
 class LLFloaterPathfindingCharacters : public LLFloaterPathfindingObjects, public LLFloaterSingleton<LLFloaterPathfindingCharacters>
 {
 public:
+/* Singu Note: Capsule doesn't seem to work without havok
 	virtual void                                    onClose(bool pIsAppQuitting);
 
 	BOOL                                            isShowPhysicsCapsule() const;
 	void                                            setShowPhysicsCapsule(BOOL pIsShowPhysicsCapsule);
 
 	BOOL                                            isPhysicsCapsuleEnabled(LLUUID& id, LLVector3& pos, LLQuaternion& rot) const;
+*/
 
 	static void                                     openCharactersWithSelectedObjects();
 
@@ -62,7 +66,7 @@ protected:
 
 	virtual void                       buildObjectsScrollList(const LLPathfindingObjectListPtr pObjectListPtr);
 
-	virtual void                       updateControlsOnScrollListChange();
+//	virtual void                       updateControlsOnScrollListChange();
 
 	virtual S32                        getNameColumnIndex() const;
 	virtual S32                        getOwnerNameColumnIndex() const;
@@ -72,10 +76,12 @@ protected:
 	virtual LLPathfindingObjectListPtr getEmptyObjectList() const;
 
 private:
-	void onShowPhysicsCapsuleClicked();
+//	void onShowPhysicsCapsuleClicked();
+
 
 	LLSD buildCharacterScrollListItemData(const LLPathfindingCharacter *pCharacterPtr) const;
 
+/* Singu Note: Capsule doesn't seem to work without havok
 	void updateStateOnDisplayControls();
 	void showSelectedCharacterCapsules();
 
@@ -85,6 +91,7 @@ private:
 	bool getCapsuleRenderData(LLVector3& pPosition, LLQuaternion& rot) const;
 
 	LLCheckBoxCtrl                                   *mShowPhysicsCapsuleCheckBox;
+*/
 
 	LLUUID                                           mSelectedCharacterId;
 

indra/newview/pipeline.cpp

@@ -9971,6 +9971,7 @@ void LLPipeline::addDebugBlip(const LLVector3& position, const LLColor4& color)
 	mDebugBlips.push_back(blip);
 }
 
+/* Singu Note: This is currently only used upstream by code that requires havok
 void LLPipeline::hideObject( const LLUUID& id )
 {
 	LLViewerObject *pVO = gObjectList.findObject( id );
@@ -10037,4 +10038,5 @@ void LLPipeline::restoreHiddenObject( const LLUUID& id )
 		}
 	}
 }
+*/
 

indra/newview/skins/default/xui/en-us/floater_pathfinding_characters.xml

@@ -161,6 +161,7 @@
         left_delta="242"
         bottom_delta="-5"
         width="150" />
+<!-- Singu NOTE: Requires havok
     <check_box
         height="19"
         follows="left|bottom"
@@ -170,7 +171,8 @@
         top_pad="-19"
         left_delta="150"
         bottom_delta="0"
-        width="150" />
+		width="150" />
+-->
     <button
         follows="left|bottom"
         height="22"