diff options
Diffstat (limited to 'indra/newview/llfloaterpathfindingcharacters.cpp')
| -rw-r--r-- | indra/newview/llfloaterpathfindingcharacters.cpp | 19 |
1 files changed, 0 insertions, 19 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) |