summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--indra/newview/llfloaterpathfindingcharacters.cpp19
-rw-r--r--indra/newview/llfloaterpathfindingcharacters.h3
-rw-r--r--indra/newview/llpathfindingcharacter.cpp31
-rw-r--r--indra/newview/llpathfindingcharacter.h6
4 files changed, 0 insertions, 59 deletions
diff --git a/indra/newview/llfloaterpathfindingcharacters.cpp b/indra/newview/llfloaterpathfindingcharacters.cpp
index 60e66174f3..09fd17855c 100644
--- a/indra/newview/llfloaterpathfindingcharacters.cpp
+++ b/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)
diff --git a/indra/newview/llfloaterpathfindingcharacters.h b/indra/newview/llfloaterpathfindingcharacters.h
index be178d2746..a181a66ebd 100644
--- a/indra/newview/llfloaterpathfindingcharacters.h
+++ b/indra/newview/llfloaterpathfindingcharacters.h
@@ -83,9 +83,6 @@ private:
LLCheckBoxCtrl *mShowPhysicsCapsuleCheckBox;
-#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
- bool mHasCharacterShapeData;
-#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
LLUUID mSelectedCharacterId;
LLColor4 mBeaconColor;
diff --git a/indra/newview/llpathfindingcharacter.cpp b/indra/newview/llpathfindingcharacter.cpp
index 42130d9fde..98e9141043 100644
--- a/indra/newview/llpathfindingcharacter.cpp
+++ b/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
}
diff --git a/indra/newview/llpathfindingcharacter.h b/indra/newview/llpathfindingcharacter.h
index 772b68c533..1b0a154d77 100644
--- a/indra/newview/llpathfindingcharacter.h
+++ b/indra/newview/llpathfindingcharacter.h
@@ -43,9 +43,6 @@ public:
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 @@ private:
F32 mCPUTime;
-#ifndef SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
- bool mHasShapeData;
-#endif // SERVER_SIDE_CHARACTER_SHAPE_ROLLOUT_COMPLETE
BOOL mIsHorizontal;
F32 mLength;
F32 mRadius;
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-11 15:13:13 +0000