diff options
author | Loren Shih <seraph@lindenlab.com> | 2010-05-11 15:46:48 -0400 |
---|---|---|
committer | Loren Shih <seraph@lindenlab.com> | 2010-05-11 15:46:48 -0400 |
commit | 37dc96ccdde6263188ffc4f620492a4bb2017761 (patch) | |
tree | a30a05b08a64d3e2e83d50f1488aac902d542501 /indra/newview/llviewerinventory.cpp | |
parent | 4c03806be99d4cb0df55b345f4c758f39d7f8560 (diff) | |
parent | 215ae1ed5d79f44549ade91f7e84134ab4589447 (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 ac10b09a37..1e7780bb26 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 { |