Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://bitbucket.org/SingularityViewer/singularityviewer into Frosting

Browse Source 
Conflicts:
	indra/newview/linux_tools/wrapper.sh
This commit is contained in:
Lirusaito
2013-05-12 03:33:34 -04:00
parent 417dcb4e49 b344873954
commit 5fc712104a
177 changed files with 7233 additions and 4499 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
indra/newview/llviewerinventory.cpp
View File

@@ -353,22 +353,25 @@ void LLViewerInventoryItem::fetchFromServer(void) const
{
std::string url;
LLViewerRegion* region = gAgent.getRegion();
// we have to check region. It can be null after region was destroyed. See EXT-245
if (region)
if (gSavedSettings.getBOOL("UseHTTPInventory"))
{
if(gAgent.getID() != mPermissions.getOwner())
{
url = region->getCapability("FetchLib2");
}
else
{
url = region->getCapability("FetchInventory2");
}
}
else
{
llwarns << "Agent Region is absent" << llendl;
LLViewerRegion* region = gAgent.getRegion();
// 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("FetchLib2");
}
else
{
url = region->getCapability("FetchInventory2");
}
}
else
{
llwarns << "Agent Region is absent" << llendl;
}
}
if (!url.empty())