PATH-738: Removing SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE ifdef.

indra/newview/llfloaterpathfindingcharacters.cpp

@@ -58,20 +58,12 @@ void LLFloaterPathfindingCharacters::onClose(bool pIsAppQuitting)
 
 BOOL LLFloaterPathfindingCharacters::isShowPhysicsCapsule() const
 {
-#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
-	return mHasCharacterShapeData && mShowPhysicsCapsuleCheckBox->get();
-#else // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
 	return mShowPhysicsCapsuleCheckBox->get();
-#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
 }
 
 void LLFloaterPathfindingCharacters::setShowPhysicsCapsule(BOOL pIsShowPhysicsCapsule)
 {
-#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
-	mShowPhysicsCapsuleCheckBox->set(mHasCharacterShapeData && pIsShowPhysicsCapsule);
-#else // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
 	mShowPhysicsCapsuleCheckBox->set(pIsShowPhysicsCapsule);
-#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
 }
 
 BOOL LLFloaterPathfindingCharacters::isPhysicsCapsuleEnabled(LLUUID& id, LLVector3& pos, LLQuaternion& rot) const
@@ -104,9 +96,6 @@ LLHandle<LLFloaterPathfindingCharacters> LLFloaterPathfindingCharacters::getInst
 LLFloaterPathfindingCharacters::LLFloaterPathfindingCharacters(const LLSD& pSeed)
 	: LLFloaterPathfindingObjects(pSeed),
 	mShowPhysicsCapsuleCheckBox(NULL),
-#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
-	mHasCharacterShapeData(false),
-#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
 	mSelectedCharacterId(),
 	mBeaconColor(),
 	mSelfHandle()
@@ -147,10 +136,6 @@ LLSD LLFloaterPathfindingCharacters::convertObjectsIntoScrollListData(const LLPa
 		LLSD element = buildCharacterScrollListData(characterPtr);
 		scrollListData.append(element);
 
-#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
-		mHasCharacterShapeData = characterPtr->hasShapeData();
-#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
-
 		if (characterPtr->hasOwner() && !characterPtr->hasOwnerName())
 		{
 			rebuildScrollListAfterAvatarNameLoads(characterPtr->getUUID());
@@ -236,11 +221,7 @@ LLSD LLFloaterPathfindingCharacters::buildCharacterScrollListData(const LLPathfi
 void LLFloaterPathfindingCharacters::updateStateOnDisplayControls()
 {
 	int numSelectedItems = getNumSelectedObjects();;
-#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
-	bool isEditEnabled = mHasCharacterShapeData && (numSelectedItems == 1);
-#else // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
 	bool isEditEnabled = (numSelectedItems == 1);
-#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
 
 	mShowPhysicsCapsuleCheckBox->setEnabled(isEditEnabled);
 	if (!isEditEnabled)

indra/newview/llfloaterpathfindingcharacters.h

@@ -83,9 +83,6 @@ class LLFloaterPathfindingCharacters : public LLFloaterPathfindingObjects
 
 	LLCheckBoxCtrl                                   *mShowPhysicsCapsuleCheckBox;
 
-#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
-	bool                                             mHasCharacterShapeData;
-#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
 	LLUUID                                           mSelectedCharacterId;
 
 	LLColor4                                         mBeaconColor;

indra/newview/llpathfindingcharacter.cpp

@@ -45,9 +45,6 @@
 LLPathfindingCharacter::LLPathfindingCharacter(const std::string &pUUID, const LLSD& pCharacterData)
 	: LLPathfindingObject(pUUID, pCharacterData),
 	mCPUTime(0U),
-#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
-	mHasShapeData(false),
-#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
 	mIsHorizontal(FALSE),
 	mLength(0.0f),
 	mRadius(0.0f)
@@ -58,9 +55,6 @@ LLPathfindingCharacter::LLPathfindingCharacter(const std::string &pUUID, const L
 LLPathfindingCharacter::LLPathfindingCharacter(const LLPathfindingCharacter& pOther)
 	: LLPathfindingObject(pOther),
 	mCPUTime(pOther.mCPUTime),
-#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
-	mHasShapeData(pOther.mHasShapeData),
-#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
 	mIsHorizontal(pOther.mIsHorizontal),
 	mLength(pOther.mLength),
 	mRadius(pOther.mRadius)
@@ -76,9 +70,6 @@ LLPathfindingCharacter& LLPathfindingCharacter::operator =(const LLPathfindingCh
 	dynamic_cast<LLPathfindingObject &>(*this) = pOther;
 
 	mCPUTime = pOther.mCPUTime;
-#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
-	mHasShapeData = pOther.mHasShapeData;
-#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
 	mIsHorizontal = pOther.mIsHorizontal;
 	mLength = pOther.mLength;
 	mRadius = pOther.mRadius;
@@ -92,27 +83,6 @@ void LLPathfindingCharacter::parseCharacterData(const LLSD &pCharacterData)
 	llassert(pCharacterData.get(CHARACTER_CPU_TIME_FIELD).isReal());
 	mCPUTime = pCharacterData.get(CHARACTER_CPU_TIME_FIELD).asReal();
 
-#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
-	mHasShapeData = pCharacterData.has(CHARACTER_HORIZONTAL_FIELD);
-	if (mHasShapeData)
-	{
-		llassert(pCharacterData.has(CHARACTER_HORIZONTAL_FIELD));
-		llassert(pCharacterData.get(CHARACTER_HORIZONTAL_FIELD).isBoolean());
-		mIsHorizontal = pCharacterData.get(CHARACTER_HORIZONTAL_FIELD).asBoolean();
-
-		llassert(pCharacterData.has(CHARACTER_LENGTH_FIELD));
-		llassert(pCharacterData.get(CHARACTER_LENGTH_FIELD).isReal());
-		mLength = pCharacterData.get(CHARACTER_LENGTH_FIELD).asReal();
-
-		llassert(pCharacterData.has(CHARACTER_RADIUS_FIELD));
-		llassert(pCharacterData.get(CHARACTER_RADIUS_FIELD).isReal());
-		mRadius = pCharacterData.get(CHARACTER_RADIUS_FIELD).asReal();
-
-		//Create the rep inside the pathing library
-		LLVector3 empty(0,0,0);
-		LLPathingLib::getInstance()->createPhysicsCapsuleRep( mLength, mRadius, mIsHorizontal, empty, getUUID() );
-	}
-#else // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
 	llassert(pCharacterData.has(CHARACTER_HORIZONTAL_FIELD));
 	llassert(pCharacterData.get(CHARACTER_HORIZONTAL_FIELD).isBoolean());
 	mIsHorizontal = pCharacterData.get(CHARACTER_HORIZONTAL_FIELD).asBoolean();
@@ -128,5 +98,4 @@ void LLPathfindingCharacter::parseCharacterData(const LLSD &pCharacterData)
 	//Create the rep inside the pathing library
 	LLVector3 empty(0,0,0);
 	LLPathingLib::getInstance()->createPhysicsCapsuleRep( mLength, mRadius, mIsHorizontal, empty, getUUID() );
-#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
 }

indra/newview/llpathfindingcharacter.h

@@ -43,9 +43,6 @@ class LLPathfindingCharacter : public LLPathfindingObject
 
 	inline F32  getCPUTime() const   {return mCPUTime;};
 
-#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
-	inline bool hasShapeData() const {return mHasShapeData;};
-#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
 	inline BOOL isHorizontal() const {return mIsHorizontal;};
 	inline F32  getLength() const    {return mLength;};
 	inline F32  getRadius() const    {return mRadius;};
@@ -59,9 +56,6 @@ class LLPathfindingCharacter : public LLPathfindingObject
 
 	F32  mCPUTime;
 
-#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
-	bool mHasShapeData;
-#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
 	BOOL mIsHorizontal;
 	F32  mLength;
 	F32  mRadius;