diff options
| author | Todd Stinson <stinson@lindenlab.com> | 2012-06-28 15:57:29 -0700 |
|---|---|---|
| committer | Todd Stinson <stinson@lindenlab.com> | 2012-06-28 15:57:29 -0700 |
| commit | c57d00ddfaaa9840122192b6ea2553d77a7c6e99 (patch) | |
| tree | 97f290a1611b45231dfd4eccd0b578be5dae50d5 | |
| parent | 685a672b74550ca0dbf8a816257c84c9c44fd34d (diff) | |
Removing the SERVER_SIDE_OWNER_ROLLOUT_COMPLETE ifdef.
| -rw-r--r-- | indra/newview/llpathfindingobject.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/indra/newview/llpathfindingobject.cpp b/indra/newview/llpathfindingobject.cpp index f5c0f7874d..c2f509c951 100644 --- a/indra/newview/llpathfindingobject.cpp +++ b/indra/newview/llpathfindingobject.cpp @@ -120,19 +120,10 @@ void LLPathfindingObject::parseObjectData(const LLSD &pObjectData) llassert(pObjectData.get(PATHFINDING_OBJECT_DESCRIPTION_FIELD).isString()); mDescription = pObjectData.get(PATHFINDING_OBJECT_DESCRIPTION_FIELD).asString(); -#ifdef SERVER_SIDE_OWNER_ROLLOUT_COMPLETE llassert(pObjectData.has(PATHFINDING_OBJECT_OWNER_FIELD)); llassert(pObjectData.get(PATHFINDING_OBJECT_OWNER_FIELD).isUUID()); mOwnerUUID = pObjectData.get(PATHFINDING_OBJECT_OWNER_FIELD).asUUID(); - LLAvatarNameCache::get(mOwnerUUID, &mOwnerName); -#else // SERVER_SIDE_OWNER_ROLLOUT_COMPLETE - if (pObjectData.has(PATHFINDING_OBJECT_OWNER_FIELD)) - { - llassert(pObjectData.get(PATHFINDING_OBJECT_OWNER_FIELD).isUUID()); - mOwnerUUID = pObjectData.get(PATHFINDING_OBJECT_OWNER_FIELD).asUUID(); - fetchOwnerName(); - } -#endif // SERVER_SIDE_OWNER_ROLLOUT_COMPLETE + fetchOwnerName(); llassert(pObjectData.has(PATHFINDING_OBJECT_POSITION_FIELD)); llassert(pObjectData.get(PATHFINDING_OBJECT_POSITION_FIELD).isArray()); |