diff options
| author | Roxie Linden <roxie@lindenlab.com> | 2010-02-05 15:59:14 -0800 |
|---|---|---|
| committer | Roxie Linden <roxie@lindenlab.com> | 2010-02-05 15:59:14 -0800 |
| commit | 7ab41a8a815968e274ebbfc459328be40cf5479a (patch) | |
| tree | bb436c37aae93f1925e66802558cf388a74ae7f4 /indra/newview/llviewerinventory.cpp | |
| parent | b5f64f9a3f69990d584990b20957e5de9ed2d5b0 (diff) | |
transplant with 2517, also fix single username login issue
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 5605f425e0..df873f241e 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -35,7 +35,6 @@ #include "llnotificationsutil.h" #include "message.h" -#include "indra_constants.h" #include "llagent.h" #include "llviewerfoldertype.h" @@ -242,10 +241,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 { |