diff options
| author | Loren Shih <seraph@lindenlab.com> | 2010-04-07 14:47:25 -0400 |
|---|---|---|
| committer | Loren Shih <seraph@lindenlab.com> | 2010-04-07 14:47:25 -0400 |
| commit | 52293aa4bb7af45d2c3733f20982f4acb030c2d8 (patch) | |
| tree | f963815f91b6259ea403d41807d19b69e759897e /indra/newview/llviewerinventory.cpp | |
| parent | 516ec63f52245a777725d29efe3c35e4e4e72936 (diff) | |
| parent | 8ac6310020bd2d524c97c729c29a0afe4a529ecf (diff) | |
automated merge
Diffstat (limited to 'indra/newview/llviewerinventory.cpp')
| -rw-r--r-- | indra/newview/llviewerinventory.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 444d397146..8a891b1462 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -36,6 +36,7 @@ #include "llnotificationsutil.h" #include "llsdserialize.h" #include "message.h" +#include "indra_constants.h" #include "llagent.h" #include "llagentcamera.h" @@ -264,14 +265,10 @@ void LLViewerInventoryItem::fetchFromServer(void) const // we have to check region. It can be null after region was destroyed. See EXT-245 if (region) { - if(gAgent.getID() != mPermissions.getOwner()) - { - url = region->getCapability("FetchLib"); - } - else - { - url = region->getCapability("FetchInventory"); - } + if( ALEXANDRIA_LINDEN_ID.getString() == mPermissions.getOwner().getString()) + url = region->getCapability("FetchLib"); + else + url = region->getCapability("FetchInventory"); } else { |