diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 13:08:54 +0100 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-04-07 13:08:54 +0100 |
| commit | 58d1999d47baebc9af3c566b61401a946da40073 (patch) | |
| tree | 72735031bf727bff369be3e30acac69192a51fcc /indra/newview/llviewerinventory.cpp | |
| parent | e07937ced233513bcae55b2365f9ba5a15108faa (diff) | |
| parent | adce2ecdf8f3a0efcd4907699d286012124ac496 (diff) | |
merge from viewer-trunk
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 { |