diff options
author | Roxie Linden <roxie@lindenlab.com> | 2010-05-04 16:09:14 -0700 |
---|---|---|
committer | Roxie Linden <roxie@lindenlab.com> | 2010-05-04 16:09:14 -0700 |
commit | a11ec0c89f618cb9d039274e850356694a28dbb1 (patch) | |
tree | 42f4e2637220af26a68dcf8acaa8dbf042082dbc /indra/newview/llviewerinventory.cpp | |
parent | 8daf25b65c30f58889ed5923d43bf785cb758026 (diff) | |
parent | 7d8b37f72488ce30503d97d88e804160b11c6eff (diff) |
Automated merge
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
-rw-r--r-- | indra/newview/llviewerinventory.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index b39ee8b2e0..c60183dddb 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -36,7 +36,6 @@ #include "llnotificationsutil.h" #include "llsdserialize.h" #include "message.h" -#include "indra_constants.h" #include "llagent.h" #include "llagentcamera.h" @@ -299,10 +298,14 @@ void LLViewerInventoryItem::fetchFromServer(void) const // we have to check region. It can be null after region was destroyed. See EXT-245 if (region) { - if( ALEXANDRIA_LINDEN_ID.getString() == mPermissions.getOwner().getString()) - url = region->getCapability("FetchLib"); - else - url = region->getCapability("FetchInventory"); + if(gAgent.getID() != mPermissions.getOwner()) + { + url = region->getCapability("FetchLib"); + } + else + { + url = region->getCapability("FetchInventory"); + } } else { |