diff options
author | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-04-06 11:54:32 +0300 |
---|---|---|
committer | Yuri Chebotarev <ychebotarev@productengine.com> | 2010-04-06 11:54:32 +0300 |
commit | 3da3ed2ccb9bab68be113bf7a79e6f95f7b73f9e (patch) | |
tree | 76bf2106cbbed09e02340b9cb0fa2fdee422b725 /indra/newview/llviewerinventory.cpp | |
parent | 9dcdbf029c3a74de5aefca52262d4ed41626298d (diff) | |
parent | cf94709c60949d5376f8c5dc14bf5472631cd6c9 (diff) |
merge
--HG--
branch : product-engine
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 b42d25c1d8..17221219eb 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" @@ -264,10 +263,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 { |