diff options
| author | Oz Linden <oz@lindenlab.com> | 2012-07-03 05:50:31 -0400 |
|---|---|---|
| committer | Oz Linden <oz@lindenlab.com> | 2012-07-03 05:50:31 -0400 |
| commit | e575a0ef04ed35ccdf4c0de50baecfc460b6c707 (patch) | |
| tree | 927c3e9304edb7408eb81c1c1a591fa978db1b79 /indra/newview/llpathfindingobject.cpp | |
| parent | d59715d6f1028f86827f1bd7b43c29abe697fcc9 (diff) | |
| parent | 770d8b0d01d3dabeccded0df3a06058f6196d829 (diff) | |
merge up to latest pathfinding project viewer
Diffstat (limited to 'indra/newview/llpathfindingobject.cpp')
| -rw-r--r-- | indra/newview/llpathfindingobject.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/indra/newview/llpathfindingobject.cpp b/indra/newview/llpathfindingobject.cpp index 65fcedf2f5..c2f509c951 100644 --- a/indra/newview/llpathfindingobject.cpp +++ b/indra/newview/llpathfindingobject.cpp @@ -32,11 +32,11 @@ #include <string> -#include "v3math.h" #include "llavatarname.h" #include "llavatarnamecache.h" #include "llsd.h" #include "lluuid.h" +#include "v3math.h" #define PATHFINDING_OBJECT_NAME_FIELD "name" #define PATHFINDING_OBJECT_DESCRIPTION_FIELD "description" @@ -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()); |