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

Merge branch 'master' of git://github.com/Shyotl/SingularityViewer

Browse Source 
Conflicts:
	indra/newview/lldrawpoolwlsky.cpp
This commit is contained in:
Inusaito Sayori
2015-06-19 05:42:49 -04:00
parent 2bd2a7a64b 1c627317ec
commit b11511b7b9
634 changed files with 8198 additions and 12212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
indra/newview/hippogridmanager.cpp
View File

@@ -121,7 +121,7 @@ void HippoGridInfo::setPlatform(const std::string& platform)
else
{
setPlatform(PLATFORM_OTHER);
llwarns << "Unknown platform '" << platform << "' for " << mGridName << "." << llendl;
LL_WARNS() << "Unknown platform '" << platform << "' for " << mGridName << "." << LL_ENDL;
}
}
@@ -393,7 +393,7 @@ void HippoGridInfo::getGridInfo()
THROW_ALERTC(result, xml_desc, AIArgs("[ERROR]", reply));
}
llinfos << "Received: " << reply << llendl;
LL_INFOS() << "Received: " << reply << LL_ENDL;
XML_Parser parser = XML_ParserCreate(0);
XML_SetUserData(parser, this);
@@ -548,7 +548,7 @@ void HippoGridInfo::setSupportsInvLinks(bool b)
{
if (b == true && mInvLinks == false)
{
llinfos << "Inventory Link support detected" << llendl;
LL_INFOS() << "Inventory Link support detected" << LL_ENDL;
}
mInvLinks = b;
}
@@ -702,13 +702,13 @@ void HippoGridManager::addGrid(HippoGridInfo* grid)
const std::string& nick = grid->getGridName();
if (nick == "")
{
llwarns << "Ignoring to try adding grid with empty nick." << llendl;
LL_WARNS() << "Ignoring to try adding grid with empty nick." << LL_ENDL;
delete grid;
return;
}
if (mGridInfo.find(nick) != mGridInfo.end())
{
llwarns << "Ignoring to try adding existing grid " << nick << '.' << llendl;
LL_WARNS() << "Ignoring to try adding existing grid " << nick << '.' << LL_ENDL;
delete grid;
return;
}
@@ -720,12 +720,12 @@ void HippoGridManager::deleteGrid(const std::string& grid)
{
GridIterator it = mGridInfo.find(grid);
if (it == mGridInfo.end()) {
llwarns << "Trying to delete non-existing grid " << grid << '.' << llendl;
LL_WARNS() << "Trying to delete non-existing grid " << grid << '.' << LL_ENDL;
return;
}
mGridInfo.erase(it);
llinfos << "Number of grids now: " << mGridInfo.size() << llendl;
if (mGridInfo.empty()) llinfos << "Grid info map is empty." << llendl;
LL_INFOS() << "Number of grids now: " << mGridInfo.size() << LL_ENDL;
if (mGridInfo.empty()) LL_INFOS() << "Grid info map is empty." << LL_ENDL;
if (grid == mDefaultGrid)
setDefaultGrid(LLStringUtil::null); // sets first grid, if map not empty
if (grid == mCurrentGrid)
@@ -765,7 +765,7 @@ void HippoGridManager::setCurrentGrid(const std::string& grid)
}
else if (!mGridInfo.empty())
{
llwarns << "Unknown grid '" << grid << "'. Setting to default grid." << llendl;
LL_WARNS() << "Unknown grid '" << grid << "'. Setting to default grid." << LL_ENDL;
mCurrentGrid = mDefaultGrid;
}
if(mCurrentGridChangeSignal)
@@ -795,7 +795,7 @@ void HippoGridManager::parseUrl()
const std::string& url(gSavedSettings.getString("GridUpdateList"));
if (url.empty()) return;
llinfos << "Loading grid info from '" << url << "'." << llendl;
LL_INFOS() << "Loading grid info from '" << url << "'." << LL_ENDL;
// query update server
std::string escaped_url = LLWeb::escapeURL(url);
@@ -805,9 +805,9 @@ void HippoGridManager::parseUrl()
S32 status = response["status"].asInteger();
if ((status != 200) || !response["body"].isArray())
{
llinfos << "GridInfo Update failed (" << status << "): "
LL_INFOS() << "GridInfo Update failed (" << status << "): "
<< (response["body"].isString()? response["body"].asString(): "<unknown error>")
<< llendl;
<< LL_ENDL;
return;
}
@@ -821,18 +821,18 @@ void HippoGridManager::parseFile(const std::string& fileName, bool mergeIfNewer)
infile.open(fileName.c_str());
if (!infile.is_open())
{
llwarns << "Cannot find grid info file " << fileName << " to load." << llendl;
LL_WARNS() << "Cannot find grid info file " << fileName << " to load." << LL_ENDL;
return;
}
LLSD gridInfo;
if (LLSDSerialize::fromXML(gridInfo, infile) <= 0)
{
llwarns << "Unable to parse grid info file " << fileName << '.' << llendl;
LL_WARNS() << "Unable to parse grid info file " << fileName << '.' << LL_ENDL;
return;
}
llinfos << "Loading grid info file " << fileName << '.' << llendl;
LL_INFOS() << "Loading grid info file " << fileName << '.' << LL_ENDL;
parseData(gridInfo, mergeIfNewer);
}
@@ -854,12 +854,12 @@ void HippoGridManager::parseData(LLSD &gridInfo, bool mergeIfNewer)
}
if (it == end)
{
llwarns << "Grid data has no version number." << llendl;
LL_WARNS() << "Grid data has no version number." << LL_ENDL;
return;
}
}
llinfos << "Loading grid data." << llendl;
LL_INFOS() << "Loading grid data." << LL_ENDL;
LLSD::array_const_iterator it, end = gridInfo.endArray();
for (it = gridInfo.beginArray(); it != end; ++it)
@@ -965,10 +965,10 @@ void HippoGridManager::saveFile()
{
LLSDSerialize::toPrettyXML(gridInfo, file);
file.close();
llinfos << "Saved grids to " << fileName << llendl;
LL_INFOS() << "Saved grids to " << fileName << LL_ENDL;
}
else
{
llwarns << "Unable to open grid info file for save: " << fileName << llendl;
LL_WARNS() << "Unable to open grid info file for save: " << fileName << LL_ENDL;
}
}