livie
/
phoenix-firestorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compile fixes

Tank_Master 2014-06-09 23:27:05 -07:00
parent 6babf8abd2
commit 8863d9beaf
132 changed files with 533 additions and 532 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
indra/llcommon/llstring.h
View File

@ -35,6 +35,7 @@
#include <vector>
#include <map>
#include "llformat.h"
#include "llsd.h"
#if LL_LINUX || LL_SOLARIS
#include <wctype.h>

2
indra/llimage/llimagetga.cpp
View File

@ -266,7 +266,7 @@ BOOL LLImageTGA::updateData()
mColorMap = new U8[ color_map_bytes ];
if (!mColorMap)
{
LL_WARNS << "Out of Memory in BOOL LLImageTGA::updateData(), size: " << color_map_bytes << LL_ENDL;
LL_WARNS() << "Out of Memory in BOOL LLImageTGA::updateData(), size: " << color_map_bytes << LL_ENDL;
return FALSE;
}
memcpy( mColorMap, getData() + mDataOffset, color_map_bytes ); /* Flawfinder: ignore */

2
indra/llmath/lloctree.h
View File

@ -611,7 +611,7 @@ public:
ND_OCTREE_LOG << "addChild octant " << (U32)child->getOctant() << " mChildCount " << mChildCount << ND_OCTREE_LOG_END;
if( mChildCount >= 8 )
llerrs << "Octree overrun" << llendl;
LL_ERRS() << "Octree overrun" << LL_ENDL;
mChildMap[child->getOctant()] = mChildCount;

4
indra/llmessage/llurlrequest.cpp
View File

@ -85,13 +85,13 @@ LLURLRequestDetail::LLURLRequestDetail() :
if(!mCurlRequest)
{
lldebugs << "failed to allocate new curl request." << llendl;
LL_DEBUGS() << "failed to allocate new curl request." << LL_ENDL;
return;
}
if(!mCurlRequest->isValid()) //failed.
{
lldebugs << "new curl request is not valid." << llendl;
LL_DEBUGS() << "new curl request is not valid." << LL_ENDL;
delete mCurlRequest ;
mCurlRequest = NULL ;
}

4
indra/llplugin/llpluginprocesschild.cpp
View File

@ -366,8 +366,8 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message)
// This is a new region
// <FS:ND> use smartptr
// LLPluginSharedMemory *region = new LLPluginSharedMemory;
LLPluginSharedMemoryPtr region( new LLPluginSharedMemory );
LLPluginSharedMemory *region = new LLPluginSharedMemory;
//LLPluginSharedMemory region( new LLPluginSharedMemory );
// </FS:ND>
if(region->attach(name, size))

2
indra/llplugin/llpluginprocesschild.h
View File

@ -99,7 +99,7 @@ private:
// <FS:ND> Use boost::shred_ptr so LLPluginSharedMemory gets properly destroyed
// typedef std::map<std::string, LLPluginSharedMemory*> sharedMemoryRegionsType;
typedef std::map<std::string, LLPluginSharedMemoryPtr > sharedMemoryRegionsType;
typedef std::map<std::string, LLPluginSharedMemory > sharedMemoryRegionsType;
// </FS:ND>
sharedMemoryRegionsType mSharedMemoryRegions;

4
indra/llplugin/llpluginprocessparent.cpp
View File

@ -1003,8 +1003,8 @@ std::string LLPluginProcessParent::addSharedMemory(size_t size)
std::string name;
// <FS:ND> Use smartptr
// LLPluginSharedMemory *region = new LLPluginSharedMemory;
LLPluginSharedMemoryPtr region( new LLPluginSharedMemory );
LLPluginSharedMemory *region = new LLPluginSharedMemory;
//LLPluginSharedMemory region( new LLPluginSharedMemory );
// </FS:ND>
// This is a new region

2
indra/llplugin/llpluginprocessparent.h
View File

@ -162,7 +162,7 @@ private:
// <FS:ND> Use boost::shred_ptr so LLPluginSharedMemory gets properly destroyed
// typedef std::map<std::string, LLPluginSharedMemory*> sharedMemoryRegionsType;
typedef std::map<std::string, LLPluginSharedMemoryPtr > sharedMemoryRegionsType;
typedef std::map<std::string, LLPluginSharedMemory > sharedMemoryRegionsType;
// </FS:ND>
sharedMemoryRegionsType mSharedMemoryRegions;

2
indra/llplugin/llpluginsharedmemory.h
View File

@ -120,7 +120,7 @@ private:
};
typedef boost::shared_ptr< LLPluginSharedMemory > LLPluginSharedMemoryPtr;
//typedef boost::shared_ptr< LLPluginSharedMemory > LLPluginSharedMemoryPtr;
#endif // LL_LLPLUGINSHAREDMEMORY_H

4
indra/llrender/llfontgl.cpp
View File

@ -821,7 +821,7 @@ void LLFontGL::initClass(F32 screen_dpi, F32 x_scale, F32 y_scale, const std::st
if (xml_paths.empty())
{
// We didn't even find one single XUI file
llerrs << "No fonts.xml found: " << llendl;
LL_ERRS() << "No fonts.xml found: " << LL_ENDL;
}
for (string_vec_t::const_iterator path_it = xml_paths.begin();
@ -830,7 +830,7 @@ void LLFontGL::initClass(F32 screen_dpi, F32 x_scale, F32 y_scale, const std::st
{
if (!sFontRegistry->parseFontInfo(*path_it))
{
llwarns << "Bad font info file: " << *path_it << llendl;
LL_WARNS() << "Bad font info file: " << *path_it << LL_ENDL;
}
}
}

4
indra/llrender/llfontregistry.cpp
View File

@ -193,7 +193,7 @@ bool LLFontRegistry::parseFontInfo(const std::string& xml_filename)
if ( root.isNull() || ! root->hasName( "fonts" ) )
{
llwarns << "Bad font info file: " << xml_filename << llendl;
LL_WARNS() << "Bad font info file: " << xml_filename << LL_ENDL;
return false;
}
@ -202,7 +202,7 @@ bool LLFontRegistry::parseFontInfo(const std::string& xml_filename)
if (root->hasName("fonts"))
{
// Expect a collection of children consisting of "font" or "font_size" entries
bool init_succ = initFromXML(root);
bool init_succ = init_from_xml(this, root);
success = success || init_succ;
}

1
indra/llrender/llfontregistry.h
View File

@ -73,6 +73,7 @@ public:
// Load standard font info from XML file(s).
bool parseFontInfo(const std::string& xml_filename);
//bool initFromXML(LLXMLNodePtr node); //<FS:KC> Font selector
// Clear cached glyphs for all fonts.
void reset();

4
indra/llui/llbutton.cpp
View File

@ -410,12 +410,12 @@ BOOL LLButton::postBuild()
}
else
{
llwarns << "Could not find checkbox control for button " << getName() << llendl;
LL_WARNS() << "Could not find checkbox control for button " << getName() << LL_ENDL;
}
}
else
{
llwarns << "Could not create checkbox panel for button " << getName() << llendl;
LL_WARNS() << "Could not create checkbox panel for button " << getName() << LL_ENDL;
}
}
// <FS:Zi>

2
indra/llui/llconsole.cpp
View File

@ -365,7 +365,7 @@ void LLConsole::addConsoleLine(const LLWString& wline, const LLColor4 &color, LL
void LLConsole::clear()
{
llinfos << "Clearing Console..." << llendflush;
LL_INFOS() << "Clearing Console..." << LL_ENDL;
mMutex.lock();
mLines.clear();
mAddTimes.clear();

2
indra/llui/llfloaterreg.cpp
View File

@ -281,7 +281,7 @@ LLFloater* LLFloaterReg::showInstance(const std::string& name, const LLSD& key,
LLFloater* instance = getInstance(name, key);
if (instance)
{
llinfos << "show instance for refreshing group ID: " << key.asString() << llendl;
LL_INFOS() << "show instance for refreshing group ID: " << key.asString() << LL_ENDL;
instance->openFloater(key);
if (focus)
instance->setFocus(TRUE);

2
indra/llui/llkeywords.cpp
View File

@ -234,7 +234,7 @@ BOOL LLKeywords::loadFromFile( const std::string& filename )
LLXMLNodePtr xml_root;
if ( (!LLUICtrlFactory::getLayeredXMLNode(filename, xml_root)) || (xml_root.isNull()) || (!xml_root->hasName("script_library")) )
{
llwarns << "Could not read the script library (" << filename << ")" << llendl;
LL_WARNS() << "Could not read the script library (" << filename << ")" << LL_ENDL;
return FALSE;
}
for (LLXMLNode* pNode = xml_root->getFirstChild(); pNode != NULL; pNode = pNode->getNextSibling())

2
indra/llui/lllayoutstack.cpp
View File

@ -254,7 +254,7 @@ LLLayoutStack::LLLayoutStack(const LLLayoutStack::Params& p)
LLControlGroup* controlGroup=LLUI::sSettingGroups["config"];
if(!controlGroup->controlExists(mSizeControlName))
{
llwarns << "declaring control " << mSizeControlName << llendl;
LL_WARNS() << "declaring control " << mSizeControlName << LL_ENDL;
controlGroup->declareLLSD(
mSizeControlName,
LLSD(),

6
indra/llui/llmenugl.cpp
View File

@ -4078,7 +4078,7 @@ void LLContextMenu::hide()
if( !mHoverItemHandle.isDead() )
mHoverItem->setHighlight( FALSE );
else
llwarns << "Hoveritem is already dead" << llendl;
LL_WARNS() << "Hoveritem is already dead" << LL_ENDL;
// </FS:ND>
}
@ -4114,7 +4114,7 @@ BOOL LLContextMenu::handleHover( S32 x, S32 y, MASK mask )
if( !mHoverItemHandle.isDead() )
mHoverItem->setHighlight( FALSE );
else
llwarns << "Hoveritem is already dead" << llendl;
LL_WARNS() << "Hoveritem is already dead" << LL_ENDL;
// </FS:ND>
}
@ -4141,7 +4141,7 @@ BOOL LLContextMenu::handleHover( S32 x, S32 y, MASK mask )
if( !mHoverItemHandle.isDead() )
mHoverItem->setHighlight(FALSE);
else
llwarns << "Hoveritem is already dead" << llendl;
LL_WARNS() << "Hoveritem is already dead" << LL_ENDL;
mHoverItemHandle = LLHandle< LLView >();

2
indra/llui/llresmgr.cpp
View File

@ -311,7 +311,7 @@ LLLocale::LLLocale(const std::string& locale_string)
if ( new_locale_string == NULL)
{
// .c_str() : Workaround for a segfault in g++ < 4.5.3 -Zi
llwarns << "Failed to set locale " << locale_string.c_str() << llendl;
LL_WARNS() << "Failed to set locale " << locale_string.c_str() << LL_ENDL;
//LL_WARNS_ONCE("LLLocale") << "Failed to set locale " << locale_string << LL_ENDL;
setlocale(LC_ALL, SYSTEM_LOCALE.c_str());

1
indra/llui/llscrollcontainer.h
View File

@ -55,6 +55,7 @@ class LLScrollContainer : public LLUICtrl
public:
// Note: vertical comes before horizontal because vertical
// scrollbars have priority for mouse and keyboard events.
enum SCROLL_ORIENTATION { VERTICAL, HORIZONTAL, SCROLLBAR_COUNT }; // <FS:Ansariel> Scrollbar accessor
struct Params : public LLInitParam::Block<Params, LLUICtrl::Params>
{

2
indra/llui/llspinctrl.cpp
View File

@ -432,7 +432,7 @@ BOOL LLSpinCtrl::setLabelArg(const std::string& key, const LLStringExplicit& tex
}
else
{
llwarns << "Attempting to set label argument on LLSpinCtrl constructed without one " << getName() << llendl;
LL_WARNS() << "Attempting to set label argument on LLSpinCtrl constructed without one " << getName() << LL_ENDL;
}
updateLabelColor();

4
indra/llvfs/lldir.cpp
View File

@ -1167,7 +1167,7 @@ bool LLDir::setSoundCacheDir(const std::string& path)
result = true;
}
}
LL_INFOS2("AppInit", "Directories") << "Setting sound cache directory: " << mSoundCacheDir << LL_ENDL;
LL_INFOS("AppInit", "Directories") << "Setting sound cache directory: " << mSoundCacheDir << LL_ENDL;
return result;
}
@ -1192,7 +1192,7 @@ void LLDir::dumpCurrentDirectories()
LL_DEBUGS("AppInit","Directories") << " SkinBaseDir: " << getSkinBaseDir() << LL_ENDL;
LL_DEBUGS("AppInit","Directories") << " SkinDir: " << getSkinDir() << LL_ENDL;
// [SL:KB] - Patch: Viewer-Skins | Checked: 2011-02-14 (Catznip-2.5)
LL_DEBUGS2("AppInit","Directories") << " SkinThemeDir: " << getSkinThemeDir() << LL_ENDL;
LL_DEBUGS("AppInit","Directories") << " SkinThemeDir: " << getSkinThemeDir() << LL_ENDL;
// [/SL:KB]
}

14
indra/newview/NACLantispam.cpp
View File

@ -236,7 +236,7 @@ void NACLAntiSpamRegistry::setRegisteredQueueTime(EAntispamQueue queue, U32 time
{
if (queue >= ANTISPAM_QUEUE_MAX || mQueues[queue] == NULL)
{
LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(queue) << llendl;
LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(queue) << LL_ENDL;
return;
}
@ -247,7 +247,7 @@ void NACLAntiSpamRegistry::setRegisteredQueueAmount(EAntispamQueue queue, U32 am
{
if (queue >= ANTISPAM_QUEUE_MAX || mQueues[queue] == NULL)
{
LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(queue) << llendl;
LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(queue) << LL_ENDL;
return;
}
@ -291,7 +291,7 @@ void NACLAntiSpamRegistry::clearRegisteredQueue(EAntispamQueue queue)
{
if (queue >= ANTISPAM_QUEUE_MAX || mQueues[queue] == NULL)
{
LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(queue) << llendl;
LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(queue) << LL_ENDL;
return;
}
@ -302,7 +302,7 @@ void NACLAntiSpamRegistry::purgeRegisteredQueue(EAntispamQueue queue)
{
if (queue >= ANTISPAM_QUEUE_MAX || mQueues[queue] == NULL)
{
LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(queue) << llendl;
LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(queue) << LL_ENDL;
return;
}
@ -325,7 +325,7 @@ void NACLAntiSpamRegistry::blockOnQueue(EAntispamQueue queue, const LLUUID& sour
{
if (queue >= ANTISPAM_QUEUE_MAX || mQueues[queue] == NULL)
{
LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(queue) << llendl;
LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(queue) << LL_ENDL;
return;
}
mQueues[queue]->blockEntry(source);
@ -373,7 +373,7 @@ bool NACLAntiSpamRegistry::checkQueue(EAntispamQueue queue, const LLUUID& source
{
if (queue >= ANTISPAM_QUEUE_MAX || mQueues[queue] == NULL)
{
LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(queue) << llendl;
LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(queue) << LL_ENDL;
return false;
}
result = mQueues[queue]->checkEntry(source, multiplier);
@ -498,7 +498,7 @@ bool NACLAntiSpamRegistry::isBlockedOnQueue(EAntispamQueue queue, const LLUUID&
{
if (queue >= ANTISPAM_QUEUE_MAX || mQueues[queue] == NULL)
{
LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(queue) << llendl;
LL_ERRS("AntiSpam") << "CODE BUG: Attempting to use a antispam queue that was not created or was outside of the reasonable range of queues. Queue: " << getQueueName(queue) << LL_ENDL;
return false;
}

2
indra/newview/animationexplorer.cpp
View File

@ -30,7 +30,7 @@
#include "indra_constants.h" // for MASK_ALT etc.
#include "message.h" // for gMessageSystem
#include "stdenums.h" // for ADD_TOP
//#include "stdenums.h" // for ADD_TOP
#include "llagent.h" // for gAgent
#include "llanimationstates.h"
#include "llbutton.h"

64
indra/newview/aoengine.cpp
View File

@ -713,12 +713,12 @@ BOOL AOEngine::createAnimationLink(const AOSet* set,AOSet::AOState* state,const
LLInventoryModel::cat_array_t* cats;
gInventory.getDirectDescendentsOf(set->getInventoryUUID(),cats,items);
for(S32 index=0;index<cats->count();index++)
for(S32 index=0;index<cats->size();index++)
{
if(cats->get(index)->getName().compare(state->mName)==0)
if(cats->at(index)->getName().compare(state->mName)==0)
{
LL_DEBUGS("AOEngine") << "UUID found!" << LL_ENDL;
newStateFolderUUID=cats->get(index)->getUUID();
newStateFolderUUID=cats->at(index)->getUUID();
state->mInventoryUUID=newStateFolderUUID;
break;
}
@ -770,10 +770,10 @@ BOOL AOEngine::findForeignItems(const LLUUID& uuid) const
LLInventoryModel::cat_array_t* cats;
gInventory.getDirectDescendentsOf(uuid,cats,items);
for(S32 index=0;index<cats->count();index++)
for(S32 index=0;index<cats->size();index++)
{
// recurse into subfolders
if(findForeignItems(cats->get(index)->getUUID()))
if(findForeignItems(cats->at(index)->getUUID()))
{
moved=TRUE;
}
@ -782,11 +782,11 @@ BOOL AOEngine::findForeignItems(const LLUUID& uuid) const
// count backwards in case we have to remove items
BOOL wasProtected=gSavedPerAccountSettings.getBOOL("ProtectAOFolders");
gSavedPerAccountSettings.setBOOL("ProtectAOFolders",FALSE);
for(S32 index=items->count()-1;index>=0;index--)
for(S32 index=items->size()-1;index>=0;index--)
{
BOOL move=FALSE;
LLPointer<LLViewerInventoryItem> item=items->get(index);
LLPointer<LLViewerInventoryItem> item=items->at(index);
if(item->getIsLinkType())
{
if(item->getInventoryType()!=LLInventoryType::IT_ANIMATION)
@ -898,17 +898,17 @@ BOOL AOEngine::removeAnimation(const AOSet* set,AOSet::AOState* state,S32 index)
LLInventoryModel::cat_array_t* cats;
gInventory.getDirectDescendentsOf(set->getInventoryUUID(),cats,items);
for(S32 index=0;index<cats->count();index++)
for(S32 index=0;index<cats->size();index++)
{
std::vector<std::string> params;
LLStringUtil::getTokens(cats->get(index)->getName(),params,":");
LLStringUtil::getTokens(cats->at(index)->getName(),params,":");
std::string stateName=params[0];
if(state->mName.compare(stateName)==0)
{
LL_DEBUGS("AOEngine") << "folder found: " << cats->get(index)->getName() << " purging uuid " << cats->get(index)->getUUID() << LL_ENDL;
LL_DEBUGS("AOEngine") << "folder found: " << cats->at(index)->getName() << " purging uuid " << cats->at(index)->getUUID() << LL_ENDL;
purgeFolder(cats->get(index)->getUUID());
purgeFolder(cats->at(index)->getUUID());
state->mInventoryUUID.setNull();
break;
}
@ -958,25 +958,25 @@ void AOEngine::reloadStateAnimations(AOSet::AOState* state)
state->mAnimations.clear();
gInventory.getDirectDescendentsOf(state->mInventoryUUID,dummy,items);
for(S32 num=0;num<items->count();num++)
for(S32 num=0;num<items->size();num++)
{
LL_DEBUGS("AOEngine") << "Found animation link " << items->get(num)->LLInventoryItem::getName()
<< " desc " << items->get(num)->LLInventoryItem::getDescription()
<< " asset " << items->get(num)->getAssetUUID() << LL_ENDL;
LL_DEBUGS("AOEngine") << "Found animation link " << items->at(num)->LLInventoryItem::getName()
<< " desc " << items->at(num)->LLInventoryItem::getDescription()
<< " asset " << items->at(num)->getAssetUUID() << LL_ENDL;
AOSet::AOAnimation anim;
anim.mAssetUUID=items->get(num)->getAssetUUID();
LLViewerInventoryItem* linkedItem=items->get(num)->getLinkedItem();
anim.mAssetUUID=items->at(num)->getAssetUUID();
LLViewerInventoryItem* linkedItem=items->at(num)->getLinkedItem();
if(linkedItem==0)
{
LL_WARNS("AOEngine") << "linked item for link " << items->get(num)->LLInventoryItem::getName() << " not found (broken link). Skipping." << LL_ENDL;
LL_WARNS("AOEngine") << "linked item for link " << items->at(num)->LLInventoryItem::getName() << " not found (broken link). Skipping." << LL_ENDL;
continue;
}
anim.mName=linkedItem->LLInventoryItem::getName();
anim.mInventoryUUID=items->get(num)->getUUID();
anim.mInventoryUUID=items->at(num)->getUUID();
S32 sortOrder;
if(!LLStringUtil::convertToS32(items->get(num)->LLInventoryItem::getDescription(),sortOrder))
if(!LLStringUtil::convertToS32(items->at(num)->LLInventoryItem::getDescription(),sortOrder))
sortOrder=-1;
anim.mSortOrder=sortOrder;
@ -1030,9 +1030,9 @@ void AOEngine::update()
mTimerCollection.enableSettingsTimer(FALSE);
gInventory.getDirectDescendentsOf(mAOFolder,categories,items);
for(S32 index=0;index<categories->count();index++)
for(S32 index=0;index<categories->size();index++)
{
LLViewerInventoryCategory* currentCategory=categories->get(index);
LLViewerInventoryCategory* currentCategory=categories->at(index);
const std::string& setFolderName=currentCategory->getName();
std::vector<std::string> params;
LLStringUtil::getTokens(setFolderName,params,":");
@ -1083,10 +1083,10 @@ void AOEngine::update()
gInventory.getDirectDescendentsOf(currentCategory->getUUID(),stateCategories,items);
newSet->setComplete(TRUE);
for(S32 index=0;index<stateCategories->count();index++)
for(S32 index=0;index<stateCategories->size();index++)
{
std::vector<std::string> params;
LLStringUtil::getTokens(stateCategories->get(index)->getName(),params,":");
LLStringUtil::getTokens(stateCategories->at(index)->getName(),params,":");
std::string stateName=params[0];
AOSet::AOState* state=newSet->getStateByName(stateName);
@ -1097,7 +1097,7 @@ void AOEngine::update()
}
LL_DEBUGS("AOEngine") << "Reading state " << stateName << LL_ENDL;
state->mInventoryUUID=stateCategories->get(index)->getUUID();
state->mInventoryUUID=stateCategories->at(index)->getUUID();
for(U32 num=1;num<params.size();num++)
{
if(params[num]=="CY")
@ -1473,14 +1473,14 @@ void AOEngine::tick()
LLInventoryModel::cat_array_t* categories;
LLInventoryModel::item_array_t* items;
gInventory.getDirectDescendentsOf(categoryID,categories,items);
LL_DEBUGS("AOEngine") << "cat " << categories->count() << " items " << items->count() << LL_ENDL;
LL_DEBUGS("AOEngine") << "cat " << categories->size() << " items " << items->size() << LL_ENDL;
for(S32 index=0;index<categories->count();index++)
for(S32 index=0;index<categories->size();index++)
{
const std::string& catName=categories->get(index)->getName();
const std::string& catName=categories->at(index)->getName();
if(catName.compare(ROOT_AO_FOLDER)==0)
{
mAOFolder=categories->get(index)->getUUID();
mAOFolder=categories->at(index)->getUUID();
break;
}
}
@ -1628,9 +1628,9 @@ void AOEngine::parseNotecard(const char* buffer)
gInventory.getDirectDescendentsOf(mImportSet->getInventoryUUID(),dummy,items);
for(U32 index=0;index<items->size();index++)
{
animationMap[items->get(index)->getName()]=items->get(index)->getUUID();
LL_DEBUGS("AOEngine") << "animation " << items->get(index)->getName() <<
" has inventory UUID " << animationMap[items->get(index)->getName()] << LL_ENDL;
animationMap[items->at(index)->getName()]=items->at(index)->getUUID();
LL_DEBUGS("AOEngine") << "animation " << items->at(index)->getName() <<
" has inventory UUID " << animationMap[items->at(index)->getName()] << LL_ENDL;
}
// [ State ]Anim1|Anim2|Anim3

17
indra/newview/chatbar_as_cmdline.cpp
View File

@ -60,6 +60,7 @@
#include "llworld.h"
#include "llworldmap.h"
// [RLVa:KB] - Checked by TM: 2013-11-10 (RLVa-1.4.9)
#include "rlvhandler.h"
#include "rlvactions.h"
@ -245,8 +246,8 @@ public:
{
reportToNearbyChat("Phase 1 of the packager finished.");
std::stack<LLViewerInventoryItem*> lolstack;
LLDynamicArray<LLPointer<LLViewerInventoryItem> > lolinv = findInventoryInFolder(mFolderName);
for(LLDynamicArray<LLPointer<LLViewerInventoryItem> >::iterator it = lolinv.begin(); it != lolinv.end(); ++it)
std::vector<LLPointer<LLViewerInventoryItem> > lolinv = findInventoryInFolder(mFolderName);
for(std::vector<LLPointer<LLViewerInventoryItem> >::iterator it = lolinv.begin(); it != lolinv.end(); ++it)
{
LLViewerInventoryItem* item = *it;
lolstack.push(item);
@ -716,15 +717,15 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge
else if (command == std::string(sFSCmdLineOfferTp))
{
std::string avatarKey;
// llinfos << "CMD DEBUG 0 " << command << " " << avatarName << llendl;
// LL_INFOS() << "CMD DEBUG 0 " << command << " " << avatarName << LL_ENDL;
if (i >> avatarKey)
{
// llinfos << "CMD DEBUG 0 afterif " << command << " " << avatarName << llendl;
// LL_INFOS() << "CMD DEBUG 0 afterif " << command << " " << avatarName << LL_ENDL;
LLUUID tempUUID;
if (LLUUID::parseUUID(avatarKey, &tempUUID))
{
char buffer[DB_IM_MSG_BUF_SIZE * 2];
LLDynamicArray<LLUUID> ids;
std::vector<LLUUID> ids;
ids.push_back(tempUUID);
std::string tpMsg="Join me!";
LLMessageSystem* msg = gMessageSystem;
@ -736,7 +737,7 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge
msg->addU8Fast(_PREHASH_LureType, (U8)0);
msg->addStringFast(_PREHASH_Message, tpMsg);
for (LLDynamicArray<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
for (std::vector<LLUUID>::iterator itr = ids.begin(); itr != ids.end(); ++itr)
{
msg->nextBlockFast(_PREHASH_TargetData);
msg->addUUIDFast(_PREHASH_TargetID, *itr);
@ -903,8 +904,8 @@ bool cmd_line_chat(const std::string& revised_text, EChatType type, bool from_ge
{
reportToNearbyChat("Verifying folder location...");
std::stack<LLViewerInventoryItem*> lolstack;
LLDynamicArray<LLPointer<LLViewerInventoryItem> > lolinv = findInventoryInFolder(lolfolder);
for (LLDynamicArray<LLPointer<LLViewerInventoryItem> >::iterator it = lolinv.begin(); it != lolinv.end(); ++it)
std::vector<LLPointer<LLViewerInventoryItem> > lolinv = findInventoryInFolder(lolfolder);
for (std::vector<LLPointer<LLViewerInventoryItem> >::iterator it = lolinv.begin(); it != lolinv.end(); ++it)
{
LLViewerInventoryItem* item = *it;
lolstack.push(item);

2
indra/newview/daeexport.cpp
View File

@ -197,7 +197,7 @@ void ColladaExportFloater::onClickExport()
LLFilePicker& file_picker = LLFilePicker::instance();
if (!file_picker.getSaveFile(LLFilePicker::FFSAVE_COLLADA, LLDir::getScrubbedFileName(mObjectName + ".dae")))
{
llinfos << "User closed the filepicker, aborting export!" << llendl;
LL_INFOS() << "User closed the filepicker, aborting export!" << LL_ENDL;
return;
}
mFilename = file_picker.getFirstFile();

2
indra/newview/dialogstack.cpp
View File

@ -53,7 +53,7 @@ void DialogStack::pop(const LLUUID& uuid)
{
if(notificationIDs.empty())
{
llwarns << "Dialog Stack count was 0 when pop() was called." << llendl;
LL_WARNS() << "Dialog Stack count was 0 when pop() was called." << LL_ENDL;
}
else
{

2
indra/newview/fschathistory.cpp
View File

@ -927,7 +927,7 @@ static LLFastTimer::DeclareTimer FTM_APPEND_MESSAGE("Append Chat Message");
void FSChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LLStyle::Params& input_append_params)
{
LLFastTimer _(FTM_APPEND_MESSAGE);
LL_RECORD_BLOCK_TIME(FTM_APPEND_MESSAGE);
// Ansa: FIRE-12754: Hack around a weird issue where the doc size magically increases by 1px
// during draw if the doc exceeds the visible space and the scrollbar is getting visible.
mScrollToBottom = (mScroller->isAtBottom() || mScroller->getScrollbar(LLScrollContainer::VERTICAL)->getDocPosMax() <= 1);

2
indra/newview/fscommon.cpp
View File

@ -332,7 +332,7 @@ bool FSCommon::checkIsActionEnabled(const LLUUID& av_id, EFSRegistrarFunctionAct
LLSD FSCommon::populateGroupCount()
{
LLStringUtil::format_map_t args;
S32 groupcount = gAgent.mGroups.count();
S32 groupcount = gAgent.mGroups.size();
args["[COUNT]"] = llformat("%d", groupcount);
args["[REMAINING]"] = llformat("%d", gMaxAgentGroups - groupcount);
LLUIString groupcountstring = LLTrans::getString((gMaxAgentGroups ? "groupcountstring" : "groupcountunlimitedstring"), args);

3
indra/newview/fsdata.cpp
View File

@ -43,6 +43,7 @@
#include "llagent.h"
#include "llagentui.h"
#include "llfloaterabout.h"
#include "llhttpclient.h"
#include "llimview.h"
#include "llmutelist.h"
#include "llnotifications.h"
@ -910,7 +911,7 @@ void FSData::callbackReqInfo(const LLSD &notification, const LLSD &response)
LLUUID uid = subs["FROMUUID"].asUUID();
LLUUID sessionid = subs["SESSIONID"].asUUID();
llinfos << "the uuid is " << uid.asString().c_str() << llendl;
LL_INFOS() << "the uuid is " << uid.asString().c_str() << LL_ENDL;
LLAgentUI::buildFullname(my_name);
if ( option == 0 )//yes

8
indra/newview/fsexportperms.cpp
View File

@ -117,7 +117,7 @@ bool FSExportPermsCheck::canExportNode(LLSelectNode* node)
LLInventoryModel::INCLUDE_TRASH,
asset_id_matches);
for (S32 i = 0; i < items.count(); ++i)
for (S32 i = 0; i < items.size(); ++i)
{
const LLPermissions perms = items[i]->getPermissions();
exportable = perms.getCreator() == gAgentID;
@ -140,7 +140,7 @@ bool FSExportPermsCheck::canExportNode(LLSelectNode* node)
LLInventoryModel::INCLUDE_TRASH,
asset_id_matches);
for (S32 i = 0; i < items.count(); ++i)
for (S32 i = 0; i < items.size(); ++i)
{
const LLPermissions perms = items[i]->getPermissions();
switch (LFSimFeatureHandler::instance().exportPolicy())
@ -192,13 +192,13 @@ bool FSExportPermsCheck::canExportAsset(LLUUID asset_id, std::string* name, std:
LLInventoryModel::INCLUDE_TRASH,
asset_id_matches);
if (items.count())
if (items.size())
{
// use the name of the first match
(*name) = items[0]->getName();
(*description) = items[0]->getDescription();
for (S32 i = 0; i < items.count(); ++i)
for (S32 i = 0; i < items.size(); ++i)
{
if (!exportable)
{

2
indra/newview/fsfloatercontacts.cpp
View File

@ -181,7 +181,7 @@ void FSFloaterContacts::updateGroupButtons()
getChildView("info_btn")->setEnabled(isGroup);
getChildView("activate_btn")->setEnabled(groupId != gAgent.getGroupID());
getChildView("leave_btn")->setEnabled(isGroup);
getChildView("create_btn")->setEnabled((!gMaxAgentGroups) || (gAgent.mGroups.count() < gMaxAgentGroups));
getChildView("create_btn")->setEnabled((!gMaxAgentGroups) || (gAgent.mGroups.size() < gMaxAgentGroups));
getChildView("invite_btn")->setEnabled(isGroup && gAgent.hasPowerInGroup(groupId, GP_MEMBER_INVITE));
}

4
indra/newview/fsfloaterexport.cpp
View File

@ -32,7 +32,7 @@
#include "lfsimfeaturehandler.h"
#include "llagent.h"
#include "llagentconstants.h"
//#include "llagentconstants.h"
#include "llagentdata.h"
#include "llavatarnamecache.h"
#include "llbufferstream.h"
@ -1103,7 +1103,7 @@ void FSFloaterObjectExport::onClickExport()
LLFilePicker& file_picker = LLFilePicker::instance();
if(!file_picker.getSaveFile(LLFilePicker::FFSAVE_EXPORT, LLDir::getScrubbedFileName(mObjectName + ".oxp")))
{
llinfos << "User closed the filepicker, aborting export!" << llendl;
LL_INFOS() << "User closed the filepicker, aborting export!" << LL_ENDL;
return;
}
mFilename = file_picker.getFirstFile();

4
indra/newview/fsfloatergrouptitles.cpp
View File

@ -223,9 +223,9 @@ void FSFloaterGroupTitles::refreshGroupTitles()
// Add "no group"
addListItem(LLUUID::null, LLUUID::null, getString("NoGroupTitle"), LLTrans::getString("GroupsNone"), gAgent.getGroupID().isNull(), ADD_TOP);
for (S32 i = 0; i < gAgent.mGroups.count(); i++)
for (S32 i = 0; i < gAgent.mGroups.size(); i++)
{
LLGroupData group_data = gAgent.mGroups.get(i);
LLGroupData group_data = gAgent.mGroups.at(i);
FSGroupTitlesObserver* roleObserver = new FSGroupTitlesObserver(group_data, this);
mGroupTitleObserverMap[group_data.mID] = roleObserver;
LLGroupMgr::getInstance()->sendGroupTitlesRequest(group_data.mID);

7
indra/newview/fsfloaterim.cpp
View File

@ -42,6 +42,7 @@
#include "llfloaterabout.h" // for sysinfo button -Zi
#include "llfloaterreg.h"
#include "fsfloaterimcontainer.h" // to replace separate IM Floaters with multifloater container
#include "llhttpclient.h"
#include "llinventoryfunctions.h"
#include "lllayoutstack.h"
#include "llchatentry.h"
@ -1015,7 +1016,7 @@ FSFloaterIM* FSFloaterIM::show(const LLUUID& session_id)
session_id);
if (chiclet == NULL)
{
llerror("Dock chiclet for FSFloaterIM doesn't exists", 0);
LL_ERRS() << "Dock chiclet for FSFloaterIM doesn't exists" << LL_ENDL;
}
else
{
@ -1584,7 +1585,7 @@ BOOL FSFloaterIM::dropCategory(LLInventoryCategory* category, BOOL drop)
items,
LLInventoryModel::EXCLUDE_TRASH,
buddies);
S32 count = items.count();
S32 count = items.size();
if(count == 0)
{
rv = FALSE;
@ -1595,7 +1596,7 @@ BOOL FSFloaterIM::dropCategory(LLInventoryCategory* category, BOOL drop)
ids.reserve(count);
for(S32 i = 0; i < count; ++i)
{
ids.push_back(items.get(i)->getCreatorUUID());
ids.push_back(items.at(i)->getCreatorUUID());
}
inviteToSession(ids);
}

6
indra/newview/fsfloaterimport.cpp
View File

@ -1057,9 +1057,9 @@ void FSFloaterImport::searchInventory(LLUUID asset_id, LLViewerObject* object, s
LLInventoryModel::INCLUDE_TRASH,
asset_id_matches);
if (items.count())
if (items.size())
{
LLViewerInventoryItem* item = items.get(0);
LLViewerInventoryItem* item = items.at(0);
FSInventoryQueue item_queue;
item_queue.item = item;
@ -1933,7 +1933,7 @@ void FSAssetResponder::uploadComplete(const LLSD& content)
inventory_item_flags = (U32) content["inventory_flags"].asInteger();
if (inventory_item_flags != 0)
{
llinfos << "inventory_item_flags " << inventory_item_flags << llendl;
LL_INFOS() << "inventory_item_flags " << inventory_item_flags << LL_ENDL;
}
}
S32 creation_date_now = time_corrected();

10
indra/newview/fsfloaterplacedetails.cpp
View File

@ -142,8 +142,8 @@ public:
}
/*virtual*/ void setErrorStatus(U32 status, const std::string& reason)
{
llwarns << "Can't complete remote parcel request. Http Status: "
<< status << ". Reason : " << reason << llendl;
LL_WARNS() << "Can't complete remote parcel request. Http Status: "
<< status << ". Reason : " << reason << LL_ENDL;
}
private:
@ -255,13 +255,13 @@ BOOL FSFloaterPlaceDetails::postBuild()
mPlaceMenu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_place.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
if (!mPlaceMenu)
{
llwarns << "Error loading Place menu" << llendl;
LL_WARNS() << "Error loading Place menu" << LL_ENDL;
}
mLandmarkMenu = LLUICtrlFactory::getInstance()->createFromFile<LLToggleableMenu>("menu_landmark.xml", gMenuHolder, LLViewerMenuHolderGL::child_registry_t::instance());
if (!mLandmarkMenu)
{
llwarns << "Error loading Landmark menu" << llendl;
LL_WARNS() << "Error loading Landmark menu" << LL_ENDL;
}
updateVerbs();
@ -799,7 +799,7 @@ void FSFloaterPlaceDetails::onOverflowMenuItemClicked(const LLSD& param)
favorites_id,
std::string(),
LLPointer<LLInventoryCallback>(NULL));
llinfos << "Copied inventory item #" << mItem->getUUID() << " to favorites." << llendl;
LL_INFOS() << "Copied inventory item #" << mItem->getUUID() << " to favorites." << LL_ENDL;
}
}
}

4
indra/newview/fsfloatervoicecontrols.cpp
View File

@ -296,7 +296,7 @@ void FSFloaterVoiceControls::updateSession()
}
break;
default:
llwarning("Failed to determine voice call IM type", 0);
LL_WARNS() << "Failed to determine voice call IM type" << LL_ENDL;
mVoiceType = VC_GROUP_CHAT;
break;
}
@ -720,7 +720,7 @@ void FSFloaterVoiceControls::updateNotInVoiceParticipantState(LLAvatarListItem*
break;
default:
// for possible new future states.
llwarns << "Unsupported (" << getState(participant_id) << ") state for: " << item->getAvatarName() << llendl;
LL_WARNS() << "Unsupported (" << getState(participant_id) << ") state for: " << item->getAvatarName() << LL_ENDL;
break;
}
}

4
indra/newview/fsfloatervoicecontrols.h
View File

@ -178,13 +178,13 @@ private:
void setState(LLAvatarListItem* item, ESpeakerState state);
void setState(const LLUUID& speaker_id, ESpeakerState state)
{
lldebugs << "Storing state: " << speaker_id << ", " << state << llendl;
LL_DEBUGS() << "Storing state: " << speaker_id << ", " << state << LL_ENDL;
mSpeakerStateMap[speaker_id] = state;
}
ESpeakerState getState(const LLUUID& speaker_id)
{
lldebugs << "Getting state: " << speaker_id << ", " << mSpeakerStateMap[speaker_id] << llendl;
LL_DEBUGS() << "Getting state: " << speaker_id << ", " << mSpeakerStateMap[speaker_id] << LL_ENDL;
return mSpeakerStateMap[speaker_id];
}

26
indra/newview/fsgridhandler.cpp
View File

@ -57,13 +57,13 @@ public:
mData = grid_data;
mState = state;
llwarns << "hello " << this << llendl;
LL_WARNS() << "hello " << this << LL_ENDL;
mOwner->incResponderCount();
}
~GridInfoRequestResponder()
{
llwarns << "goodbye " << this << llendl;
LL_WARNS() << "goodbye " << this << LL_ENDL;
}
// the grid info is no LLSD *sigh* ... override the default LLSD parsing behaviour
@ -72,7 +72,7 @@ public:
const LLIOPipe::buffer_ptr_t& buffer)
{
mOwner->decResponderCount();
LL_DEBUGS("GridManager") << mData->grid[GRID_VALUE] << " status: " << status << " reason: " << reason << llendl;
LL_DEBUGS("GridManager") << mData->grid[GRID_VALUE] << " status: " << status << " reason: " << reason << LL_ENDL;
if(LLGridManager::TRYLEGACY == mState && 200 == status)
{
mOwner->addGrid(mData, LLGridManager::SYSTEM);
@ -96,8 +96,8 @@ public:
//[REASON] contact support of [GRID].
LLNotificationsUtil::add("CantAddGrid", args);
llwarns << " Could not parse grid info xml from server."
<< mData->grid[GRID_VALUE] << " skipping." << llendl;
LL_WARNS() << " Could not parse grid info xml from server."
<< mData->grid[GRID_VALUE] << " skipping." << LL_ENDL;
mOwner->addGrid(mData, LLGridManager::FAIL);
}
}
@ -143,7 +143,7 @@ public:
//[REASON] contact support of [GRID].
LLNotificationsUtil::add("CantAddGrid", args);
llwarns << "No legacy login page. Giving up for " << mData->grid[GRID_VALUE] << llendl;
LL_WARNS() << "No legacy login page. Giving up for " << mData->grid[GRID_VALUE] << LL_ENDL;
mOwner->addGrid(mData, LLGridManager::FAIL);
}
else
@ -597,7 +597,7 @@ void LLGridManager::addGrid(GridEntry* grid_entry, AddState state)
{
if(!grid_entry)
{
llwarns << "addGrid called with NULL grid_entry. Please send a bug report." << llendl;
LL_WARNS() << "addGrid called with NULL grid_entry. Please send a bug report." << LL_ENDL;
state = FAIL;
}
if(!grid_entry->grid.has(GRID_VALUE))
@ -736,7 +736,7 @@ void LLGridManager::addGrid(GridEntry* grid_entry, AddState state)
}
uri.append("cgi-bin/login.cgi");
llwarns << "No gridinfo found. Trying if legacy login page exists: " << uri << llendl;
LL_WARNS() << "No gridinfo found. Trying if legacy login page exists: " << uri << LL_ENDL;
LLHTTPClient::get(uri, new GridInfoRequestResponder(this, grid_entry, state));
return;
}
@ -749,14 +749,14 @@ void LLGridManager::addGrid(GridEntry* grid_entry, AddState state)
if (!grid_entry->grid.has(GRID_LABEL_VALUE))
{
grid_entry->grid[GRID_LABEL_VALUE] = grid;
llwarns << "No \"gridname\" found in grid info, setting to " << grid_entry->grid[GRID_LABEL_VALUE].asString() << llendl;
LL_WARNS() << "No \"gridname\" found in grid info, setting to " << grid_entry->grid[GRID_LABEL_VALUE].asString() << LL_ENDL;
}
if (!grid_entry->grid.has(GRID_NICK_VALUE))
{
grid_entry->grid[GRID_NICK_VALUE] = grid;
llwarns << "No \"gridnick\" found in grid info, setting to " << grid_entry->grid[GRID_NICK_VALUE].asString() << llendl;
LL_WARNS() << "No \"gridnick\" found in grid info, setting to " << grid_entry->grid[GRID_NICK_VALUE].asString() << LL_ENDL;
}
}
@ -771,18 +771,18 @@ void LLGridManager::addGrid(GridEntry* grid_entry, AddState state)
{
grid_entry->grid[GRID_LOGIN_URI_VALUE] = LLSD::emptyArray();
grid_entry->grid[GRID_LOGIN_URI_VALUE].append(std::string("https://") + grid + "/cgi-bin/login.cgi");
llwarns << "Adding Legacy Login Service at:" << grid_entry->grid[GRID_LOGIN_URI_VALUE].asString() << llendl;
LL_WARNS() << "Adding Legacy Login Service at:" << grid_entry->grid[GRID_LOGIN_URI_VALUE].asString() << LL_ENDL;
}
// Populate to the default values
if (!grid_entry->grid.has(GRID_LOGIN_PAGE_VALUE))
{
grid_entry->grid[GRID_LOGIN_PAGE_VALUE] = std::string("http://") + grid + "/app/login/";
llwarns << "Adding Legacy Login Screen at:" << grid_entry->grid[GRID_LOGIN_PAGE_VALUE].asString() << llendl;
LL_WARNS() << "Adding Legacy Login Screen at:" << grid_entry->grid[GRID_LOGIN_PAGE_VALUE].asString() << LL_ENDL;
}
if (!grid_entry->grid.has(GRID_HELPER_URI_VALUE))
{
llwarns << "Adding Legacy Economy at:" << grid_entry->grid[GRID_HELPER_URI_VALUE].asString() << llendl;
LL_WARNS() << "Adding Legacy Economy at:" << grid_entry->grid[GRID_HELPER_URI_VALUE].asString() << LL_ENDL;
grid_entry->grid[GRID_HELPER_URI_VALUE] = std::string("https://") + grid + "/helpers/";
}
}

4
indra/newview/fslightshare.cpp
View File

@ -49,7 +49,7 @@ void FSLightshare::processLightshareMessage(LLMessageSystem* msg)
/// Lightshare on or off
if (!gSavedSettings.getBOOL("FSOpenSimLightshare"))
{
llinfos << "Received Lightshare message from the region, but Lightshare is disabled." << llendl;
LL_INFOS() << "Received Lightshare message from the region, but Lightshare is disabled." << LL_ENDL;
return;
}
// Be paranoid!
@ -80,7 +80,7 @@ void FSLightshare::processLightshareMessage(LLMessageSystem* msg)
msg->getBinaryDataFast(_PREHASH_ParamList, _PREHASH_Parameter, buffer, size, i, 249);
LightsharePacket* ls_packet = (LightsharePacket*)buffer; // <-- warning! ugly stupid, not byte-order safe!
llinfos << "Received Lightshare message from the region, processing it." << llendl;
LL_INFOS() << "Received Lightshare message from the region, processing it." << LL_ENDL;
processWater(ls_packet);
processSky(ls_packet);
}

32
indra/newview/fslslbridge.cpp
View File

@ -28,7 +28,7 @@
#include "llviewerprecompiledheaders.h"
#include "fslslbridge.h"
#include "fslslbridgerequest.h"
#include "imageids.h"
//#include "imageids.h"
#include "llxmlnode.h"
#include "llbufferstream.h"
#include "llsdserialize.h"
@ -1060,12 +1060,12 @@ LLUUID FSLSLBridge::findFSCategory()
gInventory.getDirectDescendentsOf(fsCatID, cats, items);
if (cats)
{
S32 count = cats->count();
S32 count = cats->size();
for (S32 i = 0; i < count; ++i)
{
if (cats->get(i)->getName() == FS_BRIDGE_FOLDER)
if (cats->at(i)->getName() == FS_BRIDGE_FOLDER)
{
bridgeCatID = cats->get(i)->getUUID();
bridgeCatID = cats->at(i)->getUUID();
}
}
}
@ -1102,12 +1102,12 @@ LLUUID FSLSLBridge::findFSBridgeContainerCategory()
gInventory.getDirectDescendentsOf(LibRootID, cats, items);
if (cats)
{
S32 count = cats->count();
S32 count = cats->size();
for (S32 i = 0; i < count; ++i)
{
if (cats->get(i)->getName() == "Objects")
if (cats->at(i)->getName() == "Objects")
{
LLUUID LibObjectsCatID = cats->get(i)->getUUID();
LLUUID LibObjectsCatID = cats->at(i)->getUUID();
if (LibObjectsCatID.notNull())
{
LLInventoryModel::item_array_t* objects_items;
@ -1115,12 +1115,12 @@ LLUUID FSLSLBridge::findFSBridgeContainerCategory()
gInventory.getDirectDescendentsOf(LibObjectsCatID, objects_cats, objects_items);
if (objects_cats)
{
S32 objects_count = objects_cats->count();
S32 objects_count = objects_cats->size();
for (S32 j = 0; j < objects_count; ++j)
{
if (objects_cats->get(j)->getName() == FS_BRIDGE_CONTAINER_FOLDER)
if (objects_cats->at(j)->getName() == FS_BRIDGE_CONTAINER_FOLDER)
{
mBridgeContainerFolderID = objects_cats->get(j)->getUUID();
mBridgeContainerFolderID = objects_cats->at(j)->getUUID();
LL_INFOS("FSLSLBridge") << "FSBridge container category found in library. UUID: " << mBridgeContainerFolderID << LL_ENDL;
gInventory.fetchDescendentsOf(mBridgeContainerFolderID);
return mBridgeContainerFolderID;
@ -1148,9 +1148,9 @@ LLViewerInventoryItem* FSLSLBridge::findInvObject(const std::string& obj_name, c
gInventory.collectDescendentsIf(catID, cats, items, FALSE, namefunctor);
for (S32 iIndex = 0; iIndex < items.count(); iIndex++)
for (S32 iIndex = 0; iIndex < items.size(); iIndex++)
{
const LLViewerInventoryItem* itemp = items.get(iIndex);
const LLViewerInventoryItem* itemp = items.at(iIndex);
if (!itemp->getIsLinkType() && (itemp->getType() == LLAssetType::AT_OBJECT))
{
itemID = itemp->getUUID();
@ -1185,9 +1185,9 @@ void FSLSLBridge::cleanUpBridgeFolder(const std::string& nameToCleanUp)
NameCollectFunctor namefunctor(nameToCleanUp);
gInventory.collectDescendentsIf(catID, cats, items, FALSE, namefunctor);
for (S32 iIndex = 0; iIndex < items.count(); iIndex++)
for (S32 iIndex = 0; iIndex < items.size(); iIndex++)
{
const LLViewerInventoryItem* itemp = items.get(iIndex);
const LLViewerInventoryItem* itemp = items.at(iIndex);
if (!itemp->getIsLinkType() && (itemp->getUUID() != mpBridge->getUUID()))
{
gInventory.purgeObject(itemp->getUUID());
@ -1261,9 +1261,9 @@ void FSLSLBridge::detachOtherBridges()
//detach everything except current valid bridge - if any
gInventory.collectDescendents(catID,cats,items,FALSE);
for (S32 iIndex = 0; iIndex < items.count(); iIndex++)
for (S32 iIndex = 0; iIndex < items.size(); iIndex++)
{
const LLViewerInventoryItem* itemp = items.get(iIndex);
const LLViewerInventoryItem* itemp = items.at(iIndex);
if (get_is_item_worn(itemp->getUUID()) &&
((fsBridge == NULL) || (itemp->getUUID() != fsBridge->getUUID())))
{

12
indra/newview/fslslbridgerequest.cpp
View File

@ -59,7 +59,7 @@ void FSLSLBridgeRequestManager::initSingleton()
void FSLSLBridgeRequestManager::processBridgeCall(const LLSD& content)
{
std::string strContent = content.asString();
llinfos << "Got info: " << strContent << llendl;
LL_INFOS() << "Got info: " << strContent << LL_ENDL;
}
FSLSLBridgeRequestResponder::FSLSLBridgeRequestResponder()
@ -72,7 +72,7 @@ void FSLSLBridgeRequestResponder::result(const LLSD& content)
{
//FSLSLBridgeRequestManager::instance().processBridgeCall(content);
std::string strContent = content.asString();
llinfos << "Got info: " << strContent << llendl;
LL_INFOS() << "Got info: " << strContent << LL_ENDL;
//do not use - infinite loop, only here for testing.
//FSLSLBridge::instance().viewerToLSL("Response_to_response|" + strContent);
@ -81,8 +81,8 @@ void FSLSLBridgeRequestResponder::result(const LLSD& content)
//If we get back an error (not found, etc...), handle it here
void FSLSLBridgeRequestResponder::error(U32 status, const std::string& reason)
{
llwarns << "FSLSLBridgeRequest::error("
<< status << ": " << reason << ")" << llendl;
LL_WARNS() << "FSLSLBridgeRequest::error("
<< status << ": " << reason << ")" << LL_ENDL;
}
// AO: The below handler is used to parse return data from the bridge, requesting bulk ZOffset updates.
@ -95,7 +95,7 @@ void FSLSLBridgeRequestRadarPosResponder::result(const LLSD& content)
if (radar)
{
std::string strContent = content.asString();
//llinfos << "Got info: " << strContent << llendl;
//LL_INFOS() << "Got info: " << strContent << LL_ENDL;
// AO: parse content into pairs of [agent UUID,agent zHeight] , update our peoplepanel radar for each one
LLUUID targetAv;
@ -113,7 +113,7 @@ void FSLSLBridgeRequestRadarPosResponder::result(const LLSD& content)
if (entry)
{
entry->setZOffset((F32)(targetZ));
//llinfos << targetAv << " ::: " << targetZ << llendl;
//LL_INFOS() << targetAv << " ::: " << targetZ << LL_ENDL;
}
}
}

60
indra/newview/fslslpreproc.cpp
View File

@ -93,7 +93,7 @@ LLUUID FSLSLPreprocessor::findInventoryByName(std::string name)
ScriptMatches namematches(name);
gInventory.collectDescendentsIf(gInventory.getRootFolderID(),cats,items,FALSE,namematches);
if (items.count())
if (items.size())
{
LLInventoryModel::item_array_t::iterator it = items.begin();
it = items.begin();
@ -129,7 +129,7 @@ std::map<std::string,LLUUID> FSLSLPreprocessor::cached_assetids;
using namespace boost::regex_constants;
#define FAILDEBUG llinfos << "line:" << __LINE__ << llendl;
#define FAILDEBUG LL_INFOS() << "line:" << __LINE__ << LL_ENDL;
#define encode_start std::string("//start_unprocessed_text\n/*")
@ -171,7 +171,7 @@ std::string FSLSLPreprocessor::decode(std::string script)
if(tip != encode_start)
{
lldebugs << "No start" << llendl;
LL_DEBUGS() << "No start" << LL_ENDL;
//if(sp != -1)trigger warningg/error?
return script;
}
@ -180,13 +180,13 @@ std::string FSLSLPreprocessor::decode(std::string script)
if(end == -1)
{
lldebugs << "No end" << llendl;
LL_DEBUGS() << "No end" << LL_ENDL;
return script;
}
std::string data = script.substr(startpoint,end-startpoint);
lldebugs << "data = " << data << llendl;
LL_DEBUGS() << "data = " << data << LL_ENDL;
std::string otext = data;
@ -336,7 +336,7 @@ std::string FSLSLPreprocessor::lslopt(std::string script)
int pos = TOPfmatch.position(boost::match_results<std::string::const_iterator>::size_type(0));
std::string funcb = scopeript2(top, pos);
functions[funcname] = funcb;
lldebugs << "func " << funcname << " added to list[" << funcb << "]" << llendl;
LL_DEBUGS() << "func " << funcname << " added to list[" << funcb << "]" << LL_ENDL;
top.erase(pos,funcb.size());
}
@ -412,11 +412,11 @@ std::string FSLSLPreprocessor::lslopt(std::string script)
std::string err = "not a valid regular expression: \"";
err += e.what();
err += "\"; optimization skipped";
llwarns << err << llendl;
LL_WARNS() << err << LL_ENDL;
}
catch (...)
{
llwarns << "unexpected exception caught; optimization skipped" << llendl;
LL_WARNS() << "unexpected exception caught; optimization skipped" << LL_ENDL;
}
return script;
}
@ -433,11 +433,11 @@ std::string FSLSLPreprocessor::lslcomp(std::string script)
std::string err = "not a valid regular expression: \"";
err += e.what();
err += "\"; compression skipped";
llwarns << err << llendl;
LL_WARNS() << err << LL_ENDL;
}
catch (...)
{
llwarns << "unexpected exception caught; compression skipped" << llendl;
LL_WARNS() << "unexpected exception caught; compression skipped" << LL_ENDL;
}
return script;
}
@ -470,7 +470,7 @@ public:
std::string const &filename, bool include_next)
{
std::string cfilename = filename.substr(1,filename.length()-2);
lldebugs << cfilename << ":found_include_directive" << llendl;
LL_DEBUGS() << cfilename << ":found_include_directive" << LL_ENDL;
LLUUID item_id = FSLSLPreprocessor::findInventoryByName(cfilename);
if(item_id.notNull())
{
@ -578,7 +578,7 @@ public:
if( !err.compare( e.description())){
err = "Ignoring warning: ";
err += e.description();
llwarns << err << llendl;
LL_WARNS() << err << LL_ENDL;
}
else{
boost::throw_exception(e);
@ -601,7 +601,7 @@ void cache_script(std::string name, std::string content)
{
content += "\n";/*hack!*/
lldebugs << "writing " << name << " to cache" << llendl;
LL_DEBUGS() << "writing " << name << " to cache" << LL_ENDL;
std::string path = gDirUtilp->getExpandedFilename(LL_PATH_CACHE,"lslpreproc",name);
LLAPRFile infile(path.c_str(), LL_APR_WB);
if( infile.getFileHandle() )
@ -614,7 +614,7 @@ void FSLSLPreprocessor::FSProcCacheCallback(LLVFS *vfs, const LLUUID& iuuid, LLA
{
LLUUID uuid = iuuid;
lldebugs << "cachecallback called" << llendl;
LL_DEBUGS() << "cachecallback called" << LL_ENDL;
ProcCacheInfo* info =(ProcCacheInfo*)userdata;
LLViewerInventoryItem* item = info->item;
FSLSLPreprocessor* self = info->self;
@ -639,13 +639,13 @@ void FSLSLPreprocessor::FSProcCacheCallback(LLVFS *vfs, const LLUUID& iuuid, LLA
delete buffer;
if(boost::filesystem::native(name))
{
lldebugs << "native name of " << name << llendl;
LL_DEBUGS() << "native name of " << name << LL_ENDL;
self->mCore->mErrorList->setCommentText(std::string("Cached ")+name);
cache_script(name, content);
std::set<std::string>::iterator loc = self->caching_files.find(name);
if(loc != self->caching_files.end())
{
lldebugs << "finalizing cache" << llendl;
LL_DEBUGS() << "finalizing cache" << LL_ENDL;
self->caching_files.erase(loc);
//self->cached_files.insert(name);
if(uuid.isNull())uuid.generate();
@ -655,7 +655,7 @@ void FSLSLPreprocessor::FSProcCacheCallback(LLVFS *vfs, const LLUUID& iuuid, LLA
}
else
{
lldebugs << "something went wrong" << llendl;
LL_DEBUGS() << "something went wrong" << LL_ENDL;
}
}
else self->mCore->mErrorList->setCommentText(std::string("Error: script named '") + name + "' isn't safe to copy to the filesystem. This include will fail.");
@ -800,7 +800,7 @@ std::string reformat_switch_statements(std::string script)
////reportToNearbyChat(arg);
break;
}
lldebugs << "arg=[" << arg << "]" << llendl;;
LL_DEBUGS() << "arg=[" << arg << "]" << LL_ENDL;;
std::string rstate = scopeript2(buffer, res+slen+arg.length()-1);
int cutlen = slen;
@ -813,7 +813,7 @@ std::string reformat_switch_statements(std::string script)
//rip off the scope edges
int slicestart = rstate.find("{")+1;
rstate = rstate.substr(slicestart,(rstate.rfind("}")-slicestart)-1);
lldebugs << "rstate=[" << rstate << "]" << llendl;
LL_DEBUGS() << "rstate=[" << rstate << "]" << LL_ENDL;
boost::regex findcases("\\scase\\s");
@ -833,10 +833,10 @@ std::string reformat_switch_statements(std::string script)
if(case_end != -1)
{
std::string casearg = rstate.substr(case_start+caselen,case_end-(case_start+caselen));
lldebugs << "casearg=[" << casearg << "]" << llendl;
LL_DEBUGS() << "casearg=[" << casearg << "]" << LL_ENDL;
std::string label = quicklabel();
ifs[casearg] = label;
lldebugs << "BEFORE[" << rstate << "]" << llendl;
LL_DEBUGS() << "BEFORE[" << rstate << "]" << LL_ENDL;
bool addcurl = (case_end == next_curl ? 1 : 0);
label = "@"+label+";\n";
if(addcurl)
@ -845,11 +845,11 @@ std::string reformat_switch_statements(std::string script)
}
rstate.erase(case_start,(case_end-case_start) + 1);
rstate.insert(case_start,label);
lldebugs << "AFTER[" << rstate << "]" << llendl;
LL_DEBUGS() << "AFTER[" << rstate << "]" << LL_ENDL;
}
else
{
lldebugs << "error in regex case_end != -1" << llendl;
LL_DEBUGS() << "error in regex case_end != -1" << LL_ENDL;
rstate.erase(case_start,caselen);
rstate.insert(case_start,"error; cannot find { or :");
}
@ -898,7 +898,7 @@ std::string reformat_switch_statements(std::string script)
}
rstate = rstate + "}";
lldebugs << "replacing[" << buffer.substr(res,cutlen) << "] with [" << rstate << "]" << llendl;
LL_DEBUGS() << "replacing[" << buffer.substr(res,cutlen) << "] with [" << rstate << "]" << LL_ENDL;
buffer.erase(res,cutlen);
buffer.insert(res,rstate);
@ -916,11 +916,11 @@ std::string reformat_switch_statements(std::string script)
std::string err = "not a valid regular expression: \"";
err += e.what();
err += "\"; switch statements skipped";
llwarns << err << llendl;
LL_WARNS() << err << LL_ENDL;
}
catch (...)
{
llwarns << "unexpected exception caught; buffer=[" << buffer << "]" << llendl;
LL_WARNS() << "unexpected exception caught; buffer=[" << buffer << "]" << LL_ENDL;
}
}
return script;
@ -930,7 +930,7 @@ void FSLSLPreprocessor::start_process()
{
if(mWaving)
{
llwarns << "already waving?" << llendl;
LL_WARNS() << "already waving?" << LL_ENDL;
return;
}
mWaving = TRUE;
@ -969,7 +969,7 @@ void FSLSLPreprocessor::start_process()
//display the settings
mCore->mErrorList->setCommentText(std::string(settings));
lldebugs << settings << llendl;
LL_DEBUGS() << settings << LL_ENDL;
bool errored = false;
std::string err;
try
@ -1058,7 +1058,7 @@ void FSLSLPreprocessor::start_process()
errored = TRUE;
// some preprocessing error
err = name + "(" + llformat("%d",e.line_no()) + "): " + e.description();
llwarns << err << llendl;
LL_WARNS() << err << LL_ENDL;
mCore->mErrorList->setCommentText(err);
}
catch(std::exception const& e)
@ -1076,7 +1076,7 @@ void FSLSLPreprocessor::start_process()
errored = TRUE;
err = std::string(current_position.get_file().c_str()) + llformat("%d",current_position.get_line());
err += std::string("): unexpected exception caught.");
llwarns << err << llendl;
LL_WARNS() << err << LL_ENDL;
mCore->mErrorList->setCommentText(err);
}

2
indra/newview/fsmoneytracker.cpp
View File

@ -94,6 +94,6 @@ std::string FSMoneyTracker::appendTime()
void FSMoneyTracker::clear()
{
llinfos << "Cleared." << llendl;
LL_INFOS() << "Cleared." << LL_ENDL;
mTransactionHistory->clear();
}

2
indra/newview/fspanelprofile.cpp
View File

@ -29,7 +29,7 @@
#include "fspanelprofile.h"
// Common
#include "llavatarconstants.h" //AVATAR_ONLINE
//#include "llavatarconstants.h" //AVATAR_ONLINE
#include "llavatarnamecache.h"
#include "llslurl.h"
#include "lldateutil.h" //ageFromDate

2
indra/newview/fspanelprofileclassifieds.cpp
View File

@ -30,7 +30,7 @@
#include "llagent.h"
#include "llagentpicksinfo.h"
#include "llavatarconstants.h"
//#include "llavatarconstants.h"
#include "llflatlistview.h"
#include "llfloaterreg.h"
#include "llfloaterworldmap.h"

6
indra/newview/fsparticipantlist.cpp
View File

@ -592,7 +592,7 @@ void LLParticipantList::sort()
mAvatarList->sort();
break;
default :
llwarns << "Unrecognized sort order for " << mAvatarList->getName() << llendl;
LL_WARNS() << "Unrecognized sort order for " << mAvatarList->getName() << LL_ENDL;
return;
}
}
@ -774,7 +774,7 @@ void LLParticipantList::LLParticipantListMenu::toggleMute(const LLSD& userdata,
LLPointer<LLSpeaker> speakerp = mParent.mSpeakerMgr->findSpeaker(speaker_id);
if (speakerp.isNull())
{
LL_WARNS("Speakers") << "Speaker " << speaker_id << " not found" << llendl;
LL_WARNS("Speakers") << "Speaker " << speaker_id << " not found" << LL_ENDL;
return;
}
LLAvatarListItem* item = dynamic_cast<LLAvatarListItem*>(mParent.mAvatarList->getItemByValue(speaker_id));
@ -822,7 +822,7 @@ bool LLParticipantList::LLParticipantListMenu::isGroupModerator()
{
if (!mParent.mSpeakerMgr)
{
llwarns << "Speaker manager is missing" << llendl;
LL_WARNS() << "Speaker manager is missing" << LL_ENDL;
return false;
}

6
indra/newview/fsradar.cpp
View File

@ -43,7 +43,7 @@
#include "lfsimfeaturehandler.h"
#include "llagent.h"
#include "llavataractions.h"
#include "llavatarconstants.h" // for range constants
//#include "llavatarconstants.h" // for range constants
#include "llgroupactions.h"
#include "llmutelist.h"
#include "llnotificationmanager.h"
@ -601,7 +601,7 @@ void FSRadar::updateRadarList()
msg = msg.substr(0, msg.size() - 1);
FSLSLBridgeRequestResponder* responder = new FSLSLBridgeRequestRadarPosResponder();
FSLSLBridge::instance().viewerToLSL(prefix + msg, responder);
//llinfos << " OFFSET REQUEST SEGMENT"<< prefix << msg << llendl;
//LL_INFOS() << " OFFSET REQUEST SEGMENT"<< prefix << msg << LL_ENDL;
msg = "";
updatesPerRequest = 0;
}
@ -611,7 +611,7 @@ void FSRadar::updateRadarList()
msg = msg.substr(0, msg.size() - 1);
FSLSLBridgeRequestResponder* responder = new FSLSLBridgeRequestRadarPosResponder();
FSLSLBridge::instance().viewerToLSL(prefix + msg, responder);
//llinfos << " OFFSET REQUEST FINAL " << prefix << msg << llendl;
//LL_INFOS() << " OFFSET REQUEST FINAL " << prefix << msg << LL_ENDL;
}
// clear out the dispatch queue

8
indra/newview/fsradarlistctrl.cpp
View File

@ -47,7 +47,7 @@ mContextMenu(NULL)
BOOL FSRadarListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
{
//llinfos << "handleRightMouseDown" << llendl;
//LL_INFOS() << "handleRightMouseDown" << LL_ENDL;
BOOL handled = LLUICtrl::handleRightMouseDown(x, y, mask);
// if ( mContextMenu )
// [RLVa:KB-FS] - Checked: 2011-06-11 (RLVa-1.3.1) | Added: RLVa-1.3.1
@ -58,11 +58,11 @@ BOOL FSRadarListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
std::vector<LLScrollListItem*> selected_items = getAllSelected();
if (selected_items.size() > 1)
{
//llinfos << "Right-click select by value: (multi-select)" << llendl;
//LL_INFOS() << "Right-click select by value: (multi-select)" << LL_ENDL;
uuid_vec_t selected_uuids;
for (size_t i = 0; i < selected_items.size(); i++)
{
//llinfos << "Right-click select by value: " << selected_items.at(i)->getColumn(uuid_column_index)->getValue().asUUID() << llendl;
//LL_INFOS() << "Right-click select by value: " << selected_items.at(i)->getColumn(uuid_column_index)->getValue().asUUID() << LL_ENDL;
selected_uuids.push_back(selected_items.at(i)->getColumn(uuid_column_index)->getValue().asUUID());
}
mContextMenu->show(this, selected_uuids, x, y);
@ -72,7 +72,7 @@ BOOL FSRadarListCtrl::handleRightMouseDown(S32 x, S32 y, MASK mask)
LLScrollListItem* hit_item = hitItem(x, y);
if (hit_item)
{
//llinfos << "Right-click select by value: " << hit_item->getValue() << llendl;
//LL_INFOS() << "Right-click select by value: " << hit_item->getValue() << LL_ENDL;
selectByID(hit_item->getValue());
LLUUID av = hit_item->getValue();
uuid_vec_t selected_uuids;

4
indra/newview/fsscriptlibrary.cpp
View File

@ -40,10 +40,10 @@ bool LLScriptLibrary::loadLibrary(const std::string& filename)
LLXMLNodePtr xml_root;
if ( (!LLUICtrlFactory::getLayeredXMLNode(filename, xml_root)) || (xml_root.isNull()) || (!xml_root->hasName("script_library")) )
{
llwarns << "Could not read the script library (" << filename << ")" << llendl;
LL_WARNS() << "Could not read the script library (" << filename << ")" << LL_ENDL;
return false;
}
llinfos << "Loading script library at: " << filename << llendl;
LL_INFOS() << "Loading script library at: " << filename << LL_ENDL;
for (LLXMLNode* pNode = xml_root->getFirstChild(); pNode != NULL; pNode = pNode->getNextSibling())
{
if (pNode->hasName("functions"))

4
indra/newview/fsslurl.cpp
View File

@ -67,7 +67,7 @@ LLSLURL::LLSLURL(const std::string& slurl)
{
// by default we go to agni.
mType = INVALID;
LL_DEBUGS2("AppInit", "SLURL") << "SLURL: " << slurl << LL_ENDL;
LL_DEBUGS("AppInit", "SLURL") << "SLURL: " << slurl << LL_ENDL;
if(slurl == SIM_LOCATION_HOME)
{
mType = HOME_LOCATION;
@ -205,7 +205,7 @@ LLSLURL::LLSLURL(const std::string& slurl)
if(mGrid.empty() && LLStartUp::getStartupState() == STATE_STARTED)
{
// we couldn't find the grid in the grid manager, so bail
LL_WARNS2("AppInit", "SLURL") << "unable to find grid" << LL_ENDL;
LL_WARNS() << "unable to find grid" << LL_ENDL;
return;
}
// set the type as appropriate.

20
indra/newview/kcwlinterface.cpp
View File

@ -96,7 +96,7 @@ void KCWindlightInterface::ParcelChange()
if ( (this_parcel_id != mLastParcelID) || (mLastParcelDesc != desc) ) //parcel changed
{
//llinfos << "agent in new parcel: "<< this_parcel_id << " : " << parcel->getName() << llendl;
//LL_INFOS() << "agent in new parcel: "<< this_parcel_id << " : " << parcel->getName() << LL_ENDL;
mLastParcelID = this_parcel_id;
mLastParcelDesc = desc;
@ -211,12 +211,12 @@ void KCWindlightInterface::ApplySkySettings(const LLSD& settings)
// set notes on KCWindlightInterface::haveParcelOverride
if (settings.has("sky_default") && (!mHaveRegionSettings || mRegionOverride))
{
//llinfos << "WL set : " << settings["sky_default"] << llendl;
//LL_INFOS() << "WL set : " << settings["sky_default"] << LL_ENDL;
ApplyWindLightPreset(settings["sky_default"].asString());
}
else //reset to default
{
//llinfos << "WL set : Default" << llendl;
//LL_INFOS() << "WL set : Default" << LL_ENDL;
ApplyWindLightPreset("Default");
}
}
@ -271,7 +271,7 @@ bool KCWindlightInterface::ChatCommand(std::string message, std::string from_nam
const boost::regex setWWpreset_exp("^setWWpreset\\|(.*)");
if(boost::regex_match(data.c_str(), match, setWLpreset_exp))
{
llinfos << "got setWLpreset : " << match[1] << llendl;
LL_INFOS() << "got setWLpreset : " << match[1] << LL_ENDL;
LLWLParamManager::instance()->mAnimator.mIsRunning = false;
LLWLParamManager::instance()->mAnimator.mUseLindenTime = false;
LLWLParamManager::instance()->loadPreset(match[1]);
@ -279,7 +279,7 @@ bool KCWindlightInterface::ChatCommand(std::string message, std::string from_nam
}
else if(boost::regex_match(data.c_str(), match, setWWpreset_exp))
{
llinfos << "got setWWpreset : " << match[1] << llendl;
LL_INFOS() << "got setWWpreset : " << match[1] << LL_ENDL;
LLWaterParamManager::instance()->loadPreset(match[1], true);
return true;
}
@ -302,7 +302,7 @@ bool KCWindlightInterface::ChatCommand(std::string message, std::string from_nam
if (match2[1]=="Parcel")
{
llinfos << "Got Parcel WL : " << match[2] << llendl;
LL_INFOS() << "Got Parcel WL : " << match[2] << LL_ENDL;
LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel();
LLSD payload;
@ -370,7 +370,7 @@ bool KCWindlightInterface::ParsePacelForWLSettings(const std::string& desc, LLSD
if(boost::regex_search(desc, mat_block, Parcel_exp))
{
std::string data1(mat_block[1].first, mat_block[1].second);
//llinfos << "found parcel flags block: " << mat_block[1] << llendl;
//LL_INFOS() << "found parcel flags block: " << mat_block[1] << LL_ENDL;
S32 sky_index = 0;
LLWLParamManager* wlprammgr = LLWLParamManager::getInstance();
@ -384,7 +384,7 @@ bool KCWindlightInterface::ParsePacelForWLSettings(const std::string& desc, LLSD
{
if (match[1].matched)
{
//llinfos << "sky flag: " << match[1] << " : " << match[2] << " : " << match[3] << " : " << match[5] << llendl;
//LL_INFOS() << "sky flag: " << match[1] << " : " << match[2] << " : " << match[3] << " : " << match[5] << LL_ENDL;
std::string preset(match[5]);
LLWLParamKey key(preset, LLEnvKey::SCOPE_LOCAL);
@ -416,7 +416,7 @@ bool KCWindlightInterface::ParsePacelForWLSettings(const std::string& desc, LLSD
else if (match[4].matched)
{
std::string preset(match[5]);
//llinfos << "got water: " << preset << llendl;
//LL_INFOS() << "got water: " << preset << LL_ENDL;
if(wwprammgr->hasParamSet(preset))
{
settings["water"] = preset;
@ -426,7 +426,7 @@ bool KCWindlightInterface::ParsePacelForWLSettings(const std::string& desc, LLSD
else if (match[6].matched)
{
std::string preset(match[5]);
llinfos << "got region override flag" << llendl;
LL_INFOS() << "got region override flag" << LL_ENDL;
settings["region_override"] = true;
}

4
indra/newview/lggbeamcolormapfloater.cpp
View File

@ -283,7 +283,7 @@ BOOL lggBeamColorMapFloater::handleMouseDown(S32 x,S32 y,MASK mask)
fixOrder();
}
llinfos << "we got clicked at (" << x << ", " << y << " yay! " << llendl;
LL_INFOS() << "we got clicked at (" << x << ", " << y << " yay! " << LL_ENDL;
return LLFloater::handleMouseDown(x,y,mask);
}
@ -307,7 +307,7 @@ BOOL lggBeamColorMapFloater::handleRightMouseDown(S32 x,S32 y,MASK mask)
fixOrder();
}
llinfos << "we got right clicked at (" << x << ", " << y << " yay! " << llendl;
LL_INFOS() << "we got right clicked at (" << x << ", " << y << " yay! " << LL_ENDL;
return LLFloater::handleRightMouseDown(x,y,mask);
}

2
indra/newview/lggbeammapfloater.cpp
View File

@ -154,7 +154,7 @@ BOOL lggBeamMapFloater::handleMouseDown(S32 x,S32 y,MASK mask)
a.c= getChild<LLColorSwatchCtrl>("beam_color_swatch")->get();
dots.push_back(a);
llinfos << "we got clicked at (" << x << ", " << y << " and color was " << a.c << llendl;
LL_INFOS() << "we got clicked at (" << x << ", " << y << " and color was " << a.c << LL_ENDL;
}
return LLFloater::handleMouseDown(x,y,mask);

8
indra/newview/llagent.cpp
View File

@ -472,7 +472,7 @@ void LLAgent::updateFSAlwaysFly(const LLSD &data)
fsAlwaysFly = data.asBoolean();
if (fsAlwaysFly)
{
llinfos << "Enabling Fly Override" << llendl;
LL_INFOS() << "Enabling Fly Override" << LL_ENDL;
if (gSavedSettings.getBOOL("FirstUseFlyOverride"))
{
LLNotificationsUtil::add("FirstUseFlyOverride");
@ -1673,7 +1673,7 @@ void LLAgent::clearAutorespond()
//-----------------------------------------------------------------------------
void LLAgent::selectAutorespond(BOOL selected)
{
llinfos << "Setting autorespond mode to " << selected << llendl;
LL_INFOS() << "Setting autorespond mode to " << selected << LL_ENDL;
mIsAutorespond = selected;
gSavedPerAccountSettings.setBOOL("FSAutorespondMode",selected);
// [SJ - FIRE-2177 - Making Autorespons a simple Check in the menu again for clarity]
@ -1719,7 +1719,7 @@ void LLAgent::clearAutorespondNonFriends()
//-----------------------------------------------------------------------------
void LLAgent::selectAutorespondNonFriends(BOOL selected)
{
llinfos << "Setting autorespond non-friends mode to " << selected << llendl;
LL_INFOS() << "Setting autorespond non-friends mode to " << selected << LL_ENDL;
mIsAutorespondNonFriends = selected;
gSavedPerAccountSettings.setBOOL("FSAutorespondNonFriendsMode",selected);
// [SJ - FIRE-2177 - Making Autorespons a simple Check in the menu again for clarity]
@ -1767,7 +1767,7 @@ void LLAgent::clearRejectTeleportOffers()
//-----------------------------------------------------------------------------
void LLAgent::selectRejectTeleportOffers(BOOL selected)
{
llinfos << "Setting rejecting teleport offers mode to " << selected << llendl;
LL_INFOS() << "Setting rejecting teleport offers mode to " << selected << LL_ENDL;
mIsRejectTeleportOffers = selected;
gSavedPerAccountSettings.setBOOL("FSRejectTeleportOffersMode", selected);
}

4
indra/newview/llagentwearables.cpp
View File

@ -1728,9 +1728,9 @@ void LLAgentWearables::userAttachMultipleAttachments(LLInventoryModel::item_arra
if ( (rlv_handler_t::isEnabled()) && (sInitialAttachmentsRequested) && (gRlvAttachmentLocks.hasLockedAttachmentPoint(RLV_LOCK_ANY)) )
{
// Fall-back code: everything should really already have been pruned before we get this far
for (S32 idxItem = obj_item_array.count() - 1; idxItem >= 0; idxItem--)
for (S32 idxItem = obj_item_array.size() - 1; idxItem >= 0; idxItem--)
{
const LLInventoryItem* pItem = obj_item_array.get(idxItem).get();
const LLInventoryItem* pItem = obj_item_array.at(idxItem).get();
if (!gRlvAttachmentLocks.canAttach(pItem))
{
obj_item_array.remove(idxItem);

4
indra/newview/llagentwearablesfetch.cpp
View File

@ -154,7 +154,7 @@ void LLInitialWearablesFetch::processContents()
const LLUUID& idItem = itWearableData->mItemID; bool fFound = false;
for (S32 idxItem = 0, cntItem = items_by_type[itWearableData->mType].size(); idxItem < cntItem; idxItem++)
{
const LLViewerInventoryItem* pCOFItem = items_by_type[itWearableData->mType].get(idxItem);
const LLViewerInventoryItem* pCOFItem = items_by_type[itWearableData->mType].at(idxItem);
if (idItem == pCOFItem->getLinkedUUID())
{
fFound = true;
@ -209,7 +209,7 @@ public:
// LLViewerInventoryItem *item = gInventory.getItem(*it);
// if (!item)
// {
// llwarns << "fetch failed!" << llendl;
// LL_WARNS() << "fetch failed!" << LL_ENDL;
// continue;
// }
//

34
indra/newview/llappearancemgr.cpp
View File

@ -794,7 +794,7 @@ void LLWearableHoldingPattern::onAllComplete()
// if (isAgentAvatarValid())
// {
// LL_DEBUGS("Avatar") << self_av_string() << "Updating " << mObjItems.count() << " attachments" << LL_ENDL;
// llinfos << "Updating " << mObjItems.size() << " attachments" << llendl;
// LL_INFOS() << "Updating " << mObjItems.size() << " attachments" << LL_ENDL;
// LLAgentWearables::userUpdateAttachments(mObjItems);
// }
@ -1222,9 +1222,9 @@ static void removeDuplicateItems(LLInventoryModel::item_array_t& items)
static void removeDuplicateWearableItemsByAssetID(LLInventoryModel::item_array_t& items)
{
std::set<LLUUID> idsAsset;
for (S32 idxItem = items.count() - 1; idxItem >= 0; idxItem--)
for (S32 idxItem = items.size() - 1; idxItem >= 0; idxItem--)
{
const LLViewerInventoryItem* pItem = items.get(idxItem);
const LLViewerInventoryItem* pItem = items.at(idxItem);
if (!pItem->isWearableType())
continue;
if (idsAsset.end() == idsAsset.find(pItem->getAssetUUID()))
@ -1498,7 +1498,7 @@ void LLAppearanceMgr::takeOffOutfit(const LLUUID& cat_id)
//if replacing - make sure bridge stays.
if (FSLSLBridge::instance().getBridge())
{
llinfos << "reinserting bridge at outfit remove" << llendl;
LL_INFOS() << "reinserting bridge at outfit remove" << LL_ENDL;
//items.find(FSLSLBridge::instance().getBridge());
items.removeObj(FSLSLBridge::instance().getBridge());
}
@ -1519,9 +1519,9 @@ void LLAppearanceMgr::takeOffOutfit(const LLUUID& cat_id)
// now deactivating all gestures in that folder
LLInventoryModel::item_array_t gest_items;
getDescendentsOfAssetType(cat_id, gest_items, LLAssetType::AT_GESTURE, false);
for (S32 i = 0; i < gest_items.count(); ++i)
for (S32 i = 0; i < gest_items.size(); ++i)
{
LLViewerInventoryItem *gest_item = gest_items.get(i);
LLViewerInventoryItem *gest_item = gest_items.at(i);
if ( LLGestureMgr::instance().isGestureActive( gest_item->getLinkedUUID()) )
{
LLGestureMgr::instance().deactivateGesture( gest_item->getLinkedUUID() );
@ -1836,9 +1836,9 @@ void LLAppearanceMgr::syncCOF(const LLInventoryModel::item_array_t& items,
gInventory.collectDescendents(getCOF(), cats, cur_cof_items, LLInventoryModel::EXCLUDE_TRASH);
// Purge everything in cur_cof_items that isn't part of new_cof_items
for (S32 idxCurItem = 0, cntCurItem = cur_cof_items.count(); idxCurItem < cntCurItem; idxCurItem++)
for (S32 idxCurItem = 0, cntCurItem = cur_cof_items.size(); idxCurItem < cntCurItem; idxCurItem++)
{
LLViewerInventoryItem* pItem = cur_cof_items.get(idxCurItem);
LLViewerInventoryItem* pItem = cur_cof_items.at(idxCurItem);
if (std::find_if(new_cof_items.begin(), new_cof_items.end(), RlvPredIsEqualOrLinkedItem(pItem)) == new_cof_items.end())
{
// Item doesn't exist in new_cof_items => purge (if it's a link)
@ -1858,9 +1858,9 @@ void LLAppearanceMgr::syncCOF(const LLInventoryModel::item_array_t& items,
}
// Whatever remains in new_cof_items will need to have a link created
for (S32 idxNewItem = 0, cntNewItem = new_cof_items.count(); idxNewItem < cntNewItem; idxNewItem++)
for (S32 idxNewItem = 0, cntNewItem = new_cof_items.size(); idxNewItem < cntNewItem; idxNewItem++)
{
LLViewerInventoryItem* pItem = new_cof_items.get(idxNewItem);
LLViewerInventoryItem* pItem = new_cof_items.at(idxNewItem);
if (items_to_add.end() == std::find(items_to_add.begin(), items_to_add.end(), pItem))
{
items_to_add.push_back(pItem);
@ -1943,7 +1943,7 @@ void LLAppearanceMgr::updateCOF(LLInventoryModel::item_array_t& body_items_new,
// LL_INFOS("Avatar") << self_av_string() << "starting, cat '" << (pcat ? pcat->getName() : "[UNKNOWN]") << "'" << LL_ENDL;
// [RLVa:KB] - Checked: 2010-03-26 (RLVa-1.2.0b) | Added: RLVa-1.2.0b
// RELEASE-RLVa: [SL-2.0.0] If pcat ever gets used for anything further down the beta we'll know about it
llinfos << "starting" << llendl;
LL_INFOS() << "starting" << LL_ENDL;
// [/RLVa:KB]
const LLUUID cof = getCOF();
@ -2040,9 +2040,9 @@ void LLAppearanceMgr::updateCOF(LLInventoryModel::item_array_t& body_items_new,
//if replacing - make sure bridge stays.
if (!append && FSLSLBridge::instance().getBridge())
{
llinfos << "reinserting bridge at outfit replace" << llendl;
LL_INFOS() << "reinserting bridge at outfit replace" << LL_ENDL;
obj_items.insert(obj_items.end(), FSLSLBridge::instance().getBridge());
llinfos << "reinserted bridge at outfit replace" << llendl;
LL_INFOS() << "reinserted bridge at outfit replace" << LL_ENDL;
}
}
//-TT
@ -2218,9 +2218,9 @@ void LLAppearanceMgr::updateAgentWearables(LLWearableHoldingPattern* holder, boo
if (pWearable)
RlvBehaviourNotifyHandler::onTakeOff(pWearable->getType(), true);
}
for (S32 idxItem = 0, cntItem = itemsNew.count(); idxItem < cntItem; idxItem++)
for (S32 idxItem = 0, cntItem = itemsNew.size(); idxItem < cntItem; idxItem++)
{
RlvBehaviourNotifyHandler::onWear(itemsNew.get(idxItem)->getWearableType(), true);
RlvBehaviourNotifyHandler::onWear(itemsNew.at(idxItem)->getWearableType(), true);
}
}
// [/RLVa:KB]
@ -2419,7 +2419,7 @@ void LLAppearanceMgr::updateAppearanceFromCOF(bool update_base_outfit_ordering)
}
// Don't remove attachments until avatar is fully loaded (should reduce random attaching/detaching/reattaching at log-on)
LL_DEBUGS("Avatar") << self_av_string() << "Updating " << obj_items.count() << " attachments" << LL_ENDL;
LL_DEBUGS("Avatar") << self_av_string() << "Updating " << obj_items.size() << " attachments" << LL_ENDL;
LLAgentWearables::userUpdateAttachments(obj_items, !gAgentAvatarp->isFullyLoaded());
}
// [/SL:KB]
@ -3114,7 +3114,7 @@ void LLAppearanceMgr::updateIsDirty()
// <FS:TS> FIRE-3018: Ignore the bridge when checking for dirty.
for (U32 i = 0; i < cof_items.size(); ++i)
{
LLViewerInventoryItem *item = cof_items.get(i);
LLViewerInventoryItem *item = cof_items.at(i);
if (item->getName() == FSLSLBridge::instance().currentFullName())
{

26
indra/newview/llappviewer.cpp
View File

@ -889,7 +889,7 @@ bool LLAppViewer::init()
if (clear_file.isExist(clear_settings_filename))
{
mPurgeSettings = true;
llinfos << "Purging configuration..." << llendl;
LL_INFOS() << "Purging configuration..." << LL_ENDL;
std::string delem = gDirUtilp->getDirDelimiter();
LLFile::remove(gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"CLEAR"));
@ -2038,20 +2038,20 @@ bool LLAppViewer::cleanup()
std::string per_account_settings_file = gSavedSettings.getString("PerAccountSettingsFile");
if (per_account_settings_file.empty())
{
llinfos << "Not saving per-account settings; don't know the account name yet." << llendl;
LL_INFOS() << "Not saving per-account settings; don't know the account name yet." << LL_ENDL;
}
// Only save per account settings if the previous login succeeded, otherwise
// we might end up with a cleared out settings file in case a previous login
// failed after loading per account settings. -Zi
else if (!mSavePerAccountSettings)
{
llinfos << "Not saving per-account settings; last login was not successful." << llendl;
LL_INFOS() << "Not saving per-account settings; last login was not successful." << LL_ENDL;
}
else
{
gSavedPerAccountSettings.saveToFile(per_account_settings_file, TRUE);
llinfos << "First time: Saved per-account settings to " <<
per_account_settings_file << llendl;
LL_INFOS() << "First time: Saved per-account settings to " <<
per_account_settings_file << LL_ENDL;
}
gSavedSettings.saveToFile(gSavedSettings.getString("ClientSettingsFile"), TRUE);
// /FIRE-4871
@ -2059,7 +2059,7 @@ bool LLAppViewer::cleanup()
}
else
{
llinfos << "Not saving settings, to prevent settings restore failure." << llendl;
LL_INFOS() << "Not saving settings, to prevent settings restore failure." << LL_ENDL;
}
// </FS:Zi>
@ -2268,7 +2268,7 @@ bool LLAppViewer::cleanup()
std::string themeSaved = gSavedSettings.getString("SkinCurrentTheme");
if ((skinSaved != mCurrentSkin) || (themeSaved != mCurrentSkinTheme))
{
llinfos << "Clearing skin colors." << llendflush;
LL_INFOS() << "Clearing skin colors." << LL_ENDL;
// Implementation to only purge skin colors
LLUIColorTable::instance().saveUserSettingsPaletteOnly();
@ -2299,14 +2299,14 @@ bool LLAppViewer::cleanup()
else
{
gSavedPerAccountSettings.saveToFile(per_account_settings_file, TRUE);
LL_INFO() << "Second time: Saved per-account settings to " <<
LL_INFOS() << "Second time: Saved per-account settings to " <<
per_account_settings_file << LL_ENDL;
}
// <FS:Zi> Backup Settings
}
else
{
llinfos << "Not saving settings, to prevent settings restore failure." << llendl;
LL_INFOS() << "Not saving settings, to prevent settings restore failure." << LL_ENDL;
}
// </FS:Zi>
@ -2848,7 +2848,7 @@ bool LLAppViewer::initConfiguration()
LLControlGroup* settings_group = LLControlGroup::getInstance(fsdata_global);
if(settings_group && settings_group->loadFromFile(fsdata_defaults, set_defaults))
{
llinfos << "Loaded settings file " << fsdata_defaults << llendl;
LL_INFOS() << "Loaded settings file " << fsdata_defaults << LL_ENDL;
}
//</FS:Techwolf Lupindo>
@ -5005,7 +5005,7 @@ bool LLAppViewer::initCache()
if (new_cache_location != cache_location)
{
// AO: Don't automatically purge old cache location, has unwanted side effects with shared caches, upgrades
//llwarns << new_cache_location << " is not the same as " << cache_location << ". PURGING." << llendl;
//LL_WARNS() << new_cache_location << " is not the same as " << cache_location << ". PURGING." << LL_ENDL;
//gDirUtilp->setCacheDir(gSavedSettings.getString("CacheLocation"));
//purgeCache(); // purge old cache
gSavedSettings.setString("CacheLocation", new_cache_location);
@ -5507,7 +5507,7 @@ void LLAppViewer::idle()
if (!mQuitRequested && qas_afk > 0.f && gAgent.getAFK() && gAwayTimer.getElapsedTimeF32() > qas_afk)
{
// go ahead and just quit gracefully
llinfos << "Logout, QuitAfterSecondsAFK expired." << llendl;
LL_INFOS() << "Logout, QuitAfterSecondsAFK expired." << LL_ENDL;
LLAppViewer::instance()->requestQuit();
}
// </FS:AO>
@ -6504,7 +6504,7 @@ void LLAppViewer::handleLoginComplete()
// </FS:AO>
// we logged in successfully, so save settings on logout
lLL_DEBUGS() << "Login successful, per account settings will be saved on log out." << LL_ENDL;
LL_DEBUGS() << "Login successful, per account settings will be saved on log out." << LL_ENDL;
mSavePerAccountSettings=true;
}

20
indra/newview/llavataractions.cpp
View File

@ -1535,7 +1535,7 @@ void LLAvatarActions::zoomIn(const LLUUID& idAgent)
void LLAvatarActions::getScriptInfo(const LLUUID& idAgent)
{
llinfos << "Reporting Script Info for avatar: " << idAgent.asString() << llendl;
LL_INFOS() << "Reporting Script Info for avatar: " << idAgent.asString() << LL_ENDL;
FSLSLBridge::instance().viewerToLSL("getScriptInfo|" + idAgent.asString());
}
@ -1568,14 +1568,14 @@ bool getRegionAndPosGlobalFromAgentID(const LLUUID& idAgent, const LLViewerRegio
for (; itRegion != endRegion; ++itRegion)
{
const LLViewerRegion* pRegion = *itRegion;
for (S32 idxRegionAgent = 0, cntRegionAgent = pRegion->mMapAvatars.count(); idxRegionAgent < cntRegionAgent; idxRegionAgent++)
for (S32 idxRegionAgent = 0, cntRegionAgent = pRegion->mMapAvatars.size(); idxRegionAgent < cntRegionAgent; idxRegionAgent++)
{
if (pRegion->mMapAvatarIDs.get(idxRegionAgent) == idAgent)
if (pRegion->mMapAvatarIDs.at(idxRegionAgent) == idAgent)
{
if (ppRegion)
*ppRegion = pRegion;
if (pPosGlobal)
*pPosGlobal = unpackLocalToGlobalPosition(pRegion->mMapAvatars.get(idxRegionAgent), pRegion->getOriginGlobal());
*pPosGlobal = unpackLocalToGlobalPosition(pRegion->mMapAvatars.at(idxRegionAgent), pRegion->getOriginGlobal());
return (NULL != pRegion);
}
}
@ -1639,7 +1639,7 @@ bool LLAvatarActions::canLandFreezeOrEjectMultiple(uuid_vec_t& idAgents, bool fF
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
void LLAvatarActions::landEject(const LLUUID& idAgent)
{
llinfos << "landeject " << idAgent << llendl;
LL_INFOS() << "landeject " << idAgent << LL_ENDL;
uuid_vec_t idAgents;
idAgents.push_back(idAgent);
landEjectMultiple(idAgents);
@ -1651,7 +1651,7 @@ void LLAvatarActions::landEjectMultiple(const uuid_vec_t& idAgents)
uuid_vec_t idEjectAgents(idAgents);
if (!canLandFreezeOrEjectMultiple(idEjectAgents, true))
{
llwarns << "Not allowed to eject" << llendl;
LL_WARNS() << "Not allowed to eject" << LL_ENDL;
return;
}
@ -1723,7 +1723,7 @@ bool LLAvatarActions::callbackLandEject(const LLSD& notification, const LLSD& re
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
void LLAvatarActions::landFreeze(const LLUUID& idAgent)
{
llinfos << "landfreezing " << idAgent << llendl;
LL_INFOS() << "landfreezing " << idAgent << LL_ENDL;
uuid_vec_t idAgents;
idAgents.push_back(idAgent);
landFreezeMultiple(idAgents);
@ -1799,7 +1799,7 @@ void sendEstateOwnerMessage(const LLViewerRegion* pRegion, const std::string& re
{
if (pRegion)
{
llinfos << "Sending estate request '" << request << "'" << llendl;
LL_INFOS() << "Sending estate request '" << request << "'" << LL_ENDL;
gMessageSystem->newMessage("EstateOwnerMessage");
gMessageSystem->nextBlockFast(_PREHASH_AgentData);
gMessageSystem->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
@ -1863,7 +1863,7 @@ bool LLAvatarActions::canEstateKickOrTeleportHomeMultiple(uuid_vec_t& idAgents,
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
void LLAvatarActions::estateKick(const LLUUID& idAgent)
{
llinfos << "estatekick " << idAgent << llendl;
LL_INFOS() << "estatekick " << idAgent << LL_ENDL;
uuid_vec_t idAgents;
idAgents.push_back(idAgent);
estateKickMultiple(idAgents);
@ -1925,7 +1925,7 @@ bool LLAvatarActions::callbackEstateKick(const LLSD& notification, const LLSD& r
// static - Checked: 2010-12-03 (Catznip-2.4.0g) | Added: Catznip-2.4.0g
void LLAvatarActions::estateTeleportHome(const LLUUID& idAgent)
{
llinfos << "estateTpHome " << idAgent << llendl;
LL_INFOS() << "estateTpHome " << idAgent << LL_ENDL;
uuid_vec_t idAgents;
idAgents.push_back(idAgent);
estateTeleportHomeMultiple(idAgents);

2
indra/newview/llavatarlistitem.cpp
View File

@ -48,7 +48,7 @@
#include <time.h>
#include "llavatarpropertiesprocessor.h"
#include "lldateutil.h"
#include "llavatarconstants.h"
//#include "llavatarconstants.h"
#include "indra_constants.h"
#include "llnotificationsutil.h"
#include "llvoiceclient.h"

4
indra/newview/llchiclet.cpp
View File

@ -228,7 +228,7 @@ void LLIMWellChiclet::createMenu()
{
if(mContextMenu)
{
llwarns << "Menu already exists" << llendl;
LL_WARNS() << "Menu already exists" << LL_ENDL;
return;
}
@ -1118,7 +1118,7 @@ void LLChicletPanel::onMessageCountChanged(const LLSD& data)
}
else
{
llwarns << "Unable to set counter for chiclet " << session_id << llendl;
LL_WARNS() << "Unable to set counter for chiclet " << session_id << LL_ENDL;
}
}
// </FS:Ansariel> [FS communication UI]

2
indra/newview/llchicletbar.cpp
View File

@ -114,7 +114,7 @@ void LLChicletBar::sessionAdded(const LLUUID& session_id, const std::string& nam
}
else
{
llwarns << "Could not create chiclet" << llendl;
LL_WARNS() << "Could not create chiclet" << LL_ENDL;
}
}

9
indra/newview/llcompilequeue.cpp
View File

@ -161,7 +161,7 @@ BOOL LLFloaterScriptQueue::start()
LLNotificationsUtil::add("ConfirmScriptModify", LLSD(), LLSD(), boost::bind(&LLFloaterScriptQueue::onScriptModifyConfirmation, this, _1, _2));
return true;
/*
//llinfos << "LLFloaterCompileQueue::start()" << llendl;
//LL_INFOS() << "LLFloaterCompileQueue::start()" << LL_ENDL;
std::string buffer;
LLStringUtil::format_map_t args;
@ -447,11 +447,6 @@ void LLFloaterCompileQueue::scriptArrived(LLVFS *vfs, const LLUUID& asset_id,
delete data;
}
// <FS:CR> Remove LSO Compiler
llwarns << "Legacy LSO compile and upload is no longer supported" << llendl;
#if 0
#endif // 0 // <FS:CR>
///----------------------------------------------------------------------------
/// Class LLFloaterResetQueue
///----------------------------------------------------------------------------
@ -650,7 +645,7 @@ void LLFloaterDeleteQueue::handleInventory(LLViewerObject* viewer_obj,
{
// find all of the lsl, leaving off duplicates. We'll remove
// all matching asset uuids on compilation success.
LLDynamicArray<const char*> names;
std::vector<const char*> names;
LLInventoryObject::object_list_t::const_iterator it = inv->begin();
LLInventoryObject::object_list_t::const_iterator end = inv->end();

4
indra/newview/lldrawable.h
View File

@ -326,7 +326,7 @@ inline LLFace* LLDrawable::getFace(const S32 i) const
// if our face list is empty, we have no real choice. -Zi
if(mFaces.empty())
{
LL_WARNS() << objectID << ": Empty face list." << llendl;
LL_WARNS() << objectID << ": Empty face list." << LL_ENDL;
return NULL;
}
@ -339,7 +339,7 @@ inline LLFace* LLDrawable::getFace(const S32 i) const
{
LLUUID objectID=getVObj()->getID();
llwarns << objectID << ": Null face found at index " << (U32) i << ". Max faces is: " << mFaces.size() << "." << LL_ENDL;
LL_WARNS() << objectID << ": Null face found at index " << (U32) i << ". Max faces is: " << mFaces.size() << "." << LL_ENDL;
if(i==0)
{
S32 max=getNumFaces();

6
indra/newview/llenvmanager.cpp
View File

@ -748,12 +748,12 @@ class WindLightRefresh : public LLHTTPNode
const LLSD& input) const
{
if (!input || !context || !input.isMap() || !input.has("body")) {
llinfos << "malformed WindLightRefresh!" << llendl;
LL_INFOS() << "malformed WindLightRefresh!" << LL_ENDL;
return;
}
//std::string dump = input["body"].asString();
//llwarns << dump << llendl;
//LL_WARNS() << dump << LL_ENDL;
LLSD body = input["body"];
LLEnvManagerNew *env = &LLEnvManagerNew::instance();
@ -775,7 +775,7 @@ class WindLightRefresh : public LLHTTPNode
else {
env->mInterpNextChangeMessage = true;
}
llinfos << "Windlight Refresh , interpolate:" << env->mInterpNextChangeMessage << llendl;
LL_INFOS() << "Windlight Refresh , interpolate:" << env->mInterpNextChangeMessage << LL_ENDL;
env->requestRegionSettings();
// Ansa: This cause the windlight editor and others to update since the windlight has changed!

4
indra/newview/lleventnotifier.cpp
View File

@ -188,7 +188,7 @@ bool LLEventNotifier::add(U32 eventId, F64 eventEpoch, const std::string& eventD
{
LLEventNotification *new_enp = new LLEventNotification(eventId, eventEpoch, eventDateStr, eventName);
llinfos << "Add event " << eventName << " id " << eventId << " date " << eventDateStr << llendl;
LL_INFOS() << "Add event " << eventName << " id " << eventId << " date " << eventDateStr << LL_ENDL;
if(!new_enp->isValid())
{
delete new_enp;
@ -204,7 +204,7 @@ bool LLEventNotifier::add(U32 eventId, F64 eventEpoch, const std::string& eventD
if (legacy_search) // The floater exists, send the results
legacy_search->displayEventDetails(eventId, eventEpoch, eventDateStr, eventName, eventDesc, simName, eventDuration, eventFlags, eventCover, eventGlobalPos);
else
llwarns << "Discarding EventID " << eventId << ". FSFloaterSearch does not exist!" << llendl;
LL_WARNS() << "Discarding EventID " << eventId << ". FSFloaterSearch does not exist!" << LL_ENDL;
}
return true;
}

4
indra/newview/llexternaleditor.cpp
View File

@ -47,7 +47,7 @@ LLExternalEditor::EErrorCode LLExternalEditor::setCommand(const std::string& env
LL_WARNS() << "Editor command is empty or not set" << LL_ENDL;
// <FS:CR> FIRE-10320 If no editor is set, fallback on the system open handler
//return EC_NOT_SPECIFIED;
llwarns << "Falling back on generic open handler" << llendl;
LL_WARNS() << "Falling back on generic open handler" << LL_ENDL;
#if LL_WINDOWS
std::string comspec(getenv("COMSPEC"));
comspec.append(" /C START \"%s\"");
@ -60,7 +60,7 @@ LLExternalEditor::EErrorCode LLExternalEditor::setCommand(const std::string& env
#endif
if (cmd.empty())
{
llwarns << "Failed to find generic open handler: " << cmd << llendl;
LL_WARNS() << "Failed to find generic open handler: " << cmd << LL_ENDL;
return EC_NOT_SPECIFIED;
}
// </FS:CR>

4
indra/newview/llfavoritesbar.cpp
View File

@ -1595,7 +1595,7 @@ void LLFavoritesOrderStorage::saveFavoritesSLURLs()
//LL_DEBUGS() << "Saved favorites for " << av_name.getUserName() << LL_ENDL;
//fav_llsd[av_name.getUserName()] = user_llsd;
std::string name = av_name.getUserName() + " @ " + LLGridManager::getInstance()->getGridLabel();
LL_DEBUGS()("Favorites") << "Saved favorites for " << name << LL_ENDL;
LL_DEBUGS("Favorites") << "Saved favorites for " << name << LL_ENDL;
fav_llsd[name] = user_llsd;
// </FS:CR>
@ -1626,7 +1626,7 @@ void LLFavoritesOrderStorage::removeFavoritesRecordOfUser()
// fav_llsd.erase(av_name.getUserName());
//}
std::string name = av_name.getUserName() + " @ " + LLGridManager::getInstance()->getGridLabel();
LL_DEBUGS()("Favorites") << "Removed favorites for " << name << LL_ENDL;
LL_DEBUGS("Favorites") << "Removed favorites for " << name << LL_ENDL;
if (fav_llsd.has(name))
{
fav_llsd.erase(name);

2
indra/newview/llfloaterland.cpp
View File

@ -1139,7 +1139,7 @@ void LLPanelLandGeneral::setErrorStatus(U32 status, const std::string& reason)
{
mEditUUID->setText(getString("error_resolving_uuid"));
mLastParcelLocalID = 0;
llwarns << "Can't handle remote parcel request."<< " Http Status: "<< status << ". Reason : "<< reason<<llendl;
LL_WARNS() << "Can't handle remote parcel request."<< " Http Status: "<< status << ". Reason : "<< reason<<LL_ENDL;
}
// </Ansariel>

20
indra/newview/llfloaterpreference.cpp
View File

@ -1403,7 +1403,7 @@ bool callback_clear_settings(const LLSD& notification, const LLSD& response)
// Create a filesystem marker instructing a full settings wipe
std::string clear_file_name;
clear_file_name = gDirUtilp->getExpandedFilename(LL_PATH_LOGS,"CLEAR");
llinfos << "Creating clear settings marker file " << clear_file_name << llendl;
LL_INFOS() << "Creating clear settings marker file " << clear_file_name << LL_ENDL;
LLAPRFile clear_file ;
clear_file.open(clear_file_name, LL_APR_W);
@ -1566,8 +1566,8 @@ void LLFloaterPreference::refreshEnabledState()
{
F32 mem_multiplier = gSavedSettings.getF32("RenderTextureMemoryMultiple");
S32 min_tex_mem = LLViewerTextureList::getMinVideoRamSetting();
S32 max_tex_mem = LLViewerTextureList::getMaxVideoRamSetting(false, mem_multiplier);
S32Megabytes min_tex_mem = LLViewerTextureList::getMinVideoRamSetting();
S32Megabytes max_tex_mem = LLViewerTextureList::getMaxVideoRamSetting(false, mem_multiplier);
getChild<LLSliderCtrl>("GraphicsCardTextureMemory")->setMinValue(min_tex_mem);
getChild<LLSliderCtrl>("GraphicsCardTextureMemory")->setMaxValue(max_tex_mem);
@ -3371,7 +3371,7 @@ void LLPanelPreferenceSkins::callbackRestart(const LLSD& notification, const LLS
}
if (0 == option) // Restart
{
llinfos << "User requested quit" << llendl;
LL_INFOS() << "User requested quit" << LL_ENDL;
LLAppViewer::instance()->requestQuit();
}
}
@ -3428,7 +3428,7 @@ void LLPanelPreferenceSkins::onSkinChanged()
if (gSavedSettings.getBOOL("FSSkinClobbersToolbarPrefs"))
{
llinfos << "Clearing toolbar settings." << llendl;
LL_INFOS() << "Clearing toolbar settings." << LL_ENDL;
gSavedSettings.setBOOL("ResetToolbarSettings",TRUE);
}
//</FS:AO>
@ -3509,12 +3509,12 @@ void LLPanelPreferenceSkins::refreshSkinThemeList()
// added a safeguard so the destination file is only created when the source file exists -Zi
S32 copy_prefs_file(const std::string& from, const std::string& to)
{
llwarns << "copying " << from << " to " << to << llendl;
LL_WARNS() << "copying " << from << " to " << to << LL_ENDL;
S32 rv = 0;
LLFILE* in = LLFile::fopen(from, "rb"); /*Flawfinder: ignore*/
if(!in)
{
llwarns << "couldn't open source file " << from << " - copy aborted." << llendl;
LL_WARNS() << "couldn't open source file " << from << " - copy aborted." << LL_ENDL;
return -1;
}
@ -3522,7 +3522,7 @@ S32 copy_prefs_file(const std::string& from, const std::string& to)
if(!out)
{
fclose(in);
llwarns << "couldn't open destination file " << to << " - copy aborted." << llendl;
LL_WARNS() << "couldn't open destination file " << to << " - copy aborted." << LL_ENDL;
return -1;
}
@ -3631,7 +3631,7 @@ void FSPanelPreferenceBackup::onClickBackupSettings()
// only backup settings that are not default, are persistent an are marked as "safe" to back up
if (!control->isDefault() && control->isPersisted() && control->isBackupable())
{
llwarns << control->getName() << llendl;
LL_WARNS() << control->getName() << LL_ENDL;
// copy the control to our backup group
(*group).declareControl(
control->getName(),
@ -4242,7 +4242,7 @@ void LLPanelPreferenceOpensim::refreshGridList(bool success)
if (!mGridListControl)
{
llwarns << "No GridListControl - bug or out of memory" << llendl;
LL_WARNS() << "No GridListControl - bug or out of memory" << LL_ENDL;
return;
}

4
indra/newview/llfloaterregioninfo.cpp
View File

@ -1000,7 +1000,7 @@ void LLPanelRegionOpenSettingsInfo::onClickOrs(void* userdata)
LLPanelRegionOpenSettingsInfo* self;
self = (LLPanelRegionOpenSettingsInfo*)userdata;
llinfos << "LLPanelRegionOpenSettingsInfo::onClickOrs()" << llendl;
LL_INFOS() << "LLPanelRegionOpenSettingsInfo::onClickOrs()" << LL_ENDL;
LLSD body;
std::string url = gAgent.getRegion()->getCapability("DispatchOpenRegionSettings");
@ -1028,7 +1028,7 @@ void LLPanelRegionOpenSettingsInfo::onClickOrs(void* userdata)
body["enforce_max_build"] = (LLSD::Boolean)self->childGetValue("enforce_max_build");
LLHTTPClient::post(url, body, new LLHTTPClient::Responder());
//llinfos << "data: " << LLSDXMLStreamer(body) << llendl;
//LL_INFOS() << "data: " << LLSDXMLStreamer(body) << LL_ENDL;
}
}
// </FS:CR> Aurora Sim - Region Settings Console

12
indra/newview/llfloaterscriptlimits.cpp
View File

@ -61,9 +61,9 @@
#ifndef LL_RELEASE_FOR_DOWNLOAD
// dump responder replies to LL_INFOS() for debugging
//#define DUMP_REPLIES_TO_LLINFOS
//#define DUMP_REPLIES_TO_LL_INFOS()
#ifdef DUMP_REPLIES_TO_LLINFOS
#ifdef DUMP_REPLIES_TO_LL_INFOS()
#include "llsdserialize.h"
#include "llwindow.h"
#endif
@ -189,7 +189,7 @@ void fetchScriptLimitsRegionInfoResponder::result(const LLSD& content)
{
//we don't need to test with a fake respose here (shouldn't anyway)
#ifdef DUMP_REPLIES_TO_LLINFOS
#ifdef DUMP_REPLIES_TO_LL_INFOS()
LLSDNotationStreamer notation_streamer(content);
std::ostringstream nice_llsd;
@ -271,7 +271,7 @@ void fetchScriptLimitsRegionSummaryResponder::result(const LLSD& content_ref)
#endif
#ifdef DUMP_REPLIES_TO_LLINFOS
#ifdef DUMP_REPLIES_TO_LL_INFOS()
LLSDNotationStreamer notation_streamer(content);
std::ostringstream nice_llsd;
@ -379,7 +379,7 @@ result (map)
#endif
#ifdef DUMP_REPLIES_TO_LLINFOS
#ifdef DUMP_REPLIES_TO_LL_INFOS()
LLSDNotationStreamer notation_streamer(content);
std::ostringstream nice_llsd;
@ -467,7 +467,7 @@ void fetchScriptLimitsAttachmentInfoResponder::result(const LLSD& content_ref)
#endif
#ifdef DUMP_REPLIES_TO_LLINFOS
#ifdef DUMP_REPLIES_TO_LL_INFOS()
LLSDNotationStreamer notation_streamer(content);
std::ostringstream nice_llsd;

2
indra/newview/llfloatersettingsdebug.cpp
View File

@ -45,7 +45,7 @@
#include "rlvhandler.h"
#include "rlvextensions.h"
#include "sanitycheck.h"
#include "stdenums.h" // for ADD_BOTTOM
//#include "stdenums.h" // for ADD_BOTTOM
// [/RLVa:KB]
#include "llnotificationsutil.h"
#include "llwindow.h"

6
indra/newview/llfloatersnapshot.cpp
View File

@ -1315,11 +1315,11 @@ void LLFloaterSnapshot::onOpen(const LLSD& key)
{
if (tabcontainer)
{
llinfos << "Found tab container" << llendl;
LL_INFOS() << "Found tab container" << LL_ENDL;
LLPanel* panel_snapshot_profile = tabcontainer->getPanelByName("panel_snapshot_profile");
if (panel_snapshot_profile)
{
llinfos << "Found panel tab" << llendl;
LL_INFOS() << "Found panel tab" << LL_ENDL;
tabcontainer->removeTabPanel(panel_snapshot_profile);
}
}
@ -1630,7 +1630,7 @@ void LLFloaterSnapshot::onSelectDestination()
LLPanelSnapshot* panel=(LLPanelSnapshot*) getChild<LLTabContainer>("panel_tab_container")->getCurrentPanel();
if(!panel)
{
llwarns << "no active snapshot destination found" << llendl;
LL_WARNS() << "no active snapshot destination found" << LL_ENDL;
return;
}

2
indra/newview/llfloaterworldmap.cpp
View File

@ -724,7 +724,7 @@ void LLFloaterWorldMap::requestParcelInfo(const LLVector3d& pos_global)
}
else
{
llwarns << "Cannot request parcel details: Cap not found" << llendl;
LL_WARNS() << "Cannot request parcel details: Cap not found" << LL_ENDL;
}
}
// </FS:Ansariel> Parcel details on map

6
indra/newview/llimview.cpp
View File

@ -505,7 +505,7 @@ void LLIMModel::setActiveSessionID(const LLUUID& session_id)
// check if such an ID really exists
if (!findIMSession(session_id))
{
llwarns << "Trying to set as active a non-existent session!" << llendl;
LL_WARNS() << "Trying to set as active a non-existent session!" << LL_ENDL;
return;
}
@ -2984,7 +2984,7 @@ void LLIMMgr::addMessage(
// session id, so we can leave it!
if (exoGroupMuteList::instance().isMuted(new_session_id))
{
llinfos << "Muting group chat from " << new_session_id.asString() << ": " << fixed_session_name << llendl;
LL_INFOS() << "Muting group chat from " << new_session_id.asString() << ": " << fixed_session_name << LL_ENDL;
if (gSavedSettings.getBOOL("FSReportMutedGroupChat"))
{
@ -4135,7 +4135,7 @@ public:
{
if (FSMuteAllGroups || (FSMuteGroupWhenNoticesDisabled && !group_data.mAcceptNotices))
{
llinfos << "Firestorm: muting group chat: " << group_data.mName << LL_ENDL;
LL_INFOS() << "Firestorm: muting group chat: " << group_data.mName << LL_ENDL;
if (gSavedSettings.getBOOL("FSReportMutedGroupChat"))
{

2
indra/newview/llinspectavatar.cpp
View File

@ -642,7 +642,7 @@ void LLInspectAvatar::toggleSelectedVoice(bool enabled)
virtual void errorWithContent(U32 status, const std::string& reason, const LLSD& content)
{
llwarns << "MuteVoiceResponder error [status:" << status << "]: " << content << llendl;
LL_WARNS() << "MuteVoiceResponder error [status:" << status << "]: " << content << LL_ENDL;
if ( gIMMgr )
{

48
indra/newview/llinventorymodel.cpp
View File

@ -535,12 +535,12 @@ LLUUID LLInventoryModel::findCategoryByName(std::string name)
cats = get_ptr_in_map(mParentChildCategoryTree, root_id);
if(cats)
{
S32 count = cats->count();
S32 count = cats->size();
for(S32 i = 0; i < count; ++i)
{
if(cats->get(i)->getName() == name)
if(cats->at(i)->getName() == name)
{
return cats->get(i)->getUUID();
return cats->at(i)->getUUID();
}
}
}
@ -752,10 +752,10 @@ void LLInventoryModel::collectDescendentsIf(const LLUUID& id,
// Move onto items
if(item_array)
{
S32 count = item_array->count();
S32 count = item_array->size();
for(S32 i = 0; i < count; ++i)
{
item = item_array->get(i);
item = item_array->at(i);
if(add(NULL, item))
{
items.put(item);
@ -3524,19 +3524,19 @@ void LLInventoryModel::wearWearablesOnAvatar(LLUUID category_id)
LLInventoryModel::EXCLUDE_TRASH,
is_wearable);
S32 i;
S32 wearable_count = mItemArray.count();
S32 wearable_count = mItemArray.size();
if (wearable_count > 0) //Loop through wearables.
{
//llinfos << "ReplaceWornItemsOnly wearable_count" << wearable_count << llendl;
//LL_INFOS() << "ReplaceWornItemsOnly wearable_count" << wearable_count << LL_ENDL;
int aTypes[LLWearableType::WT_COUNT] = {0};
for(i = 0; i < wearable_count; ++i)
{
//llinfos << "ReplaceWornItemsOnly wearable_count loop, i=" << i << llendl;
LLViewerInventoryItem *item = mItemArray.get(i);
//LL_INFOS() << "ReplaceWornItemsOnly wearable_count loop, i=" << i << LL_ENDL;
LLViewerInventoryItem *item = mItemArray.at(i);
int iType = (int)item->getWearableType();
//llinfos << "ReplaceWornItemsOnly wearable_count loop, iType=" << iType << llendl;
//LL_INFOS() << "ReplaceWornItemsOnly wearable_count loop, iType=" << iType << LL_ENDL;
if (item->isWearableType()
&& iType != LLWearableType::WT_INVALID
&& iType != LLWearableType::WT_NONE
@ -3547,7 +3547,7 @@ void LLInventoryModel::wearWearablesOnAvatar(LLUUID category_id)
if (aTypes[iType] == 1) //first occurence of type, remove first
{
U32 count = gAgentWearables.getWearableCount((LLWearableType::EType)iType);
//llinfos << "Type: " << iType << " count " << count << llendl;
//LL_INFOS() << "Type: " << iType << " count " << count << LL_ENDL;
for (U32 j=0; j<count; j++) //remove all
{
@ -3557,11 +3557,11 @@ void LLInventoryModel::wearWearablesOnAvatar(LLUUID category_id)
//for (LLViewerInventoryItem *item = item_array.get(i);
if (mItemArray.find((LLViewerInventoryItem *)wearable) == -1)
LLAppearanceMgr::instance().removeItemFromAvatar(wearable->getItemID());
//llinfos << "Removing wearable name: " << wearable->getName() << llendl;
//LL_INFOS() << "Removing wearable name: " << wearable->getName() << LL_ENDL;
}
//now add the first item (replace just in case)
LLAppearanceMgr::instance().wearItemOnAvatar(item->getUUID(), true, true);
//llinfos << " Wearing item: " << item->getName() << " with replace=true" << llendl;
//LL_INFOS() << " Wearing item: " << item->getName() << " with replace=true" << LL_ENDL;
}
else // just add - unless it's body
{
@ -3577,7 +3577,7 @@ void LLInventoryModel::wearWearablesOnAvatar(LLUUID category_id)
void LLInventoryModel::wearAttachmentsOnAvatar(LLUUID category_id)
{
// Find all the wearables that are in the category's subtree.
llinfos << "ReplaceWornItemsOnly find all attachments" << llendl;
LL_INFOS() << "ReplaceWornItemsOnly find all attachments" << LL_ENDL;
LLInventoryModel::cat_array_t obj_cat_array;
mObjArray.clear();
@ -3590,13 +3590,13 @@ void LLInventoryModel::wearAttachmentsOnAvatar(LLUUID category_id)
LLInventoryModel::EXCLUDE_TRASH,
is_object);
S32 i;
S32 obj_count = mObjArray.count();
S32 obj_count = mObjArray.size();
if (obj_count > 0)
{
for(i = 0; i < obj_count; ++i)
{
LLViewerInventoryItem *obj_item = mObjArray.get(i);
LLViewerInventoryItem *obj_item = mObjArray.at(i);
if (!get_is_item_worn(obj_item->getUUID()))
{
@ -3619,13 +3619,13 @@ void LLInventoryModel::wearGesturesOnAvatar(LLUUID category_id)
LLInventoryModel::EXCLUDE_TRASH,
is_gesture);
S32 i;
S32 gest_count = gest_item_array.count();
S32 gest_count = gest_item_array.size();
if (gest_count > 0)
{
for(i = 0; i < gest_count; ++i)
{
LLViewerInventoryItem *gest_item = gest_item_array.get(i);
LLViewerInventoryItem *gest_item = gest_item_array.at(i);
if (!get_is_item_worn(gest_item->getUUID()))
{
LLGestureMgr::instance().activateGesture( gest_item->getLinkedUUID() );
@ -3643,10 +3643,10 @@ void LLInventoryModel::wearAttachmentsOnAvatarCheckRemove(LLViewerObject *object
LLUUID objID = object->getAttachmentItemID();
bool isObjectInList = false;
for(int i = 0; i < mObjArray.count(); ++i)
for(int i = 0; i < mObjArray.size(); ++i)
{
if (objID == (mObjArray.get(i))->getUUID())
if (objID == (mObjArray.at(i))->getUUID())
{
isObjectInList = true;
break;
@ -3654,7 +3654,7 @@ void LLInventoryModel::wearAttachmentsOnAvatarCheckRemove(LLViewerObject *object
}
//all attachment points
S32 obj_count = mObjArray.count();
S32 obj_count = mObjArray.size();
if (isObjectInList && attachment != NULL)
{
@ -3681,7 +3681,7 @@ void LLInventoryModel::wearAttachmentsOnAvatarCheckRemove(LLViewerObject *object
bool isFound = false;
for(int j = 0; j < obj_count; ++j)
{
LLViewerInventoryItem *fold_item = mObjArray.get(j);
LLViewerInventoryItem *fold_item = mObjArray.at(j);
if (att_id == fold_item->getUUID())
{
isFound = true;
@ -3699,8 +3699,8 @@ void LLInventoryModel::wearAttachmentsOnAvatarCheckRemove(LLViewerObject *object
void LLInventoryModel::wearItemsOnAvatar(LLInventoryCategory* category)
{
if(!category) return;
llinfos << "ReplaceWornItemsOnly wear_inventory_category_on_avatar( "
<< category->getName() << " )" << llendl;
LL_INFOS() << "ReplaceWornItemsOnly wear_inventory_category_on_avatar( "
<< category->getName() << " )" << LL_ENDL;
LLUUID category_id = category->getUUID();

2
indra/newview/llinventorymodel.h
View File

@ -136,7 +136,7 @@ private:
// <FS:TT> ReplaceWornItemsOnly
item_array_t mItemArray;
item_array_t mObjArray;
LLDynamicArray<std::string> mAttPoints;
std::vector<std::string> mAttPoints;
// </FS:TT>
//--------------------------------------------------------------------

2
indra/newview/llinventorymodelbackgroundfetch.cpp
View File

@ -756,7 +756,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch()
// //{
else
{
llwarns << "FIXME! no FetchInventory2 capability" << llendl;
LL_WARNS() << "FIXME! no FetchInventory2 capability" << LL_ENDL;
// </FS:AW>
// LLMessageSystem* msg = gMessageSystem;
// msg->newMessage("FetchInventory");

2
indra/newview/llinventoryobserver.cpp
View File

@ -702,7 +702,7 @@ void LLInventoryCategoriesObserver::changed(U32 mask)
LLViewerInventoryCategory* category = gInventory.getCategory(cat_id);
if (!category)
{
llwarns << "Category : Category id = " << cat_id << " disappeared" << llendl;
LL_WARNS() << "Category : Category id = " << cat_id << " disappeared" << LL_ENDL;
cat_data.mCallback();
// Keep track of those deleted categories so we can remove them
deleted_categories_ids.push_back(cat_id);

6
indra/newview/lloutfitslist.cpp
View File

@ -498,13 +498,13 @@ void LLOutfitsList::refreshList(const LLUUID& category_id)
// <FS:ND> FIRE-6958/VWR-2862; Handle large amounts of outfits, write a least a warning into the logs.
if( vadded.size() > 128 )
llwarns << "Large amount of outfits found: " << vadded.size() << " this may cause hangs and disconnects" << llendl;
LL_WARNS() << "Large amount of outfits found: " << vadded.size() << " this may cause hangs and disconnects" << LL_ENDL;
U32 nCap = gSavedSettings.getU32( "FSDisplaySavedOutfitsCap" );
if( nCap && nCap < vadded.size() )
{
vadded.resize( nCap );
llwarns << "Capped outfits to " << nCap << " due to debug setting FSDisplaySavedOutfitsCap" << llendl;
LL_WARNS() << "Capped outfits to " << nCap << " due to debug setting FSDisplaySavedOutfitsCap" << LL_ENDL;
}
// </FS:ND>
@ -687,7 +687,7 @@ void LLOutfitsList::performAction(std::string action)
}
if ("replaceitems" == action)
{
llinfos << "replaceitems" << llendl;
LL_INFOS() << "replaceitems" << LL_ENDL;
LLAppearanceMgr::instance().wearInventoryCategory( cat, FALSE, TRUE );
}
else if ("addtooutfit" == action)

2
indra/newview/llpanelface.cpp
View File

@ -2606,7 +2606,7 @@ struct LLPanelFacePasteTexFunctor : public LLSelectedTEFunctor
}
else
{
llwarns << "LLPanelFace::onClickPaste : LLPanelFacePasteTexFunctor: Failed to read clipboard for face: " << te << llendl;
LL_WARNS() << "LLPanelFace::onClickPaste : LLPanelFacePasteTexFunctor: Failed to read clipboard for face: " << te << LL_ENDL;
}
}
return true;

2
indra/newview/llpanelgroupgeneral.cpp
View File

@ -1074,7 +1074,7 @@ void LLPanelGroupGeneral::updateMembers()
if (mMemberProgress == gdatap->mMembers.end())
{
lldebugs << " member list completed." << llendl;
LL_DEBUGS() << " member list completed." << LL_ENDL;
mListVisibleMembers->setEnabled(TRUE);
}
else

2
indra/newview/llpanelgrouplandmoney.cpp
View File

@ -826,7 +826,7 @@ void LLPanelGroupLandMoney::processPlacesReply(LLMessageSystem* msg, void**)
if(found_it == sGroupIDs.end())
{
// <FS:AW opensim currency support>
LL_INFOS() << "Group Panel Land L$ " << group_id << " no longer in existence."
//LL_INFOS() << "Group Panel Land L$ " << group_id << " no longer in existence."
LL_INFOS() << Tea::wrapCurrency("Group Panel Land L$ ") << group_id << " no longer in existence."
// </FS:AW opensim currency support>
<< LL_ENDL;

2
indra/newview/llpanellandaudio.cpp
View File

@ -174,7 +174,7 @@ void LLPanelLandAudio::refresh()
for(LLSD::array_iterator s_itr = streams.beginArray(); s_itr != streams.endArray(); ++s_itr)
{
mMusicURLEdit->add(LLSD(*s_itr));
lldebugs << "adding: " << *s_itr << " to the audio stream combo." << llendl;
LL_DEBUGS() << "adding: " << *s_itr << " to the audio stream combo." << LL_ENDL;
}
mMusicURLEdit->addSeparator(ADD_TOP);
mMusicURLEdit->add(LLSD(current_url), ADD_TOP);

2
indra/newview/llpanellogin.cpp
View File

@ -1402,7 +1402,7 @@ void LLPanelLogin::gridListChanged(bool success)
void LLPanelLogin::onModeChange(const LLSD& original_value, const LLSD& new_value)
{
// <FS:AO> make sure toolbar settings are reset on mode change
llinfos << "Clearing toolbar settings." << llendl;
LL_INFOS() << "Clearing toolbar settings." << LL_ENDL;
gSavedSettings.setBOOL("ResetToolbarSettings",TRUE);
if (original_value.asString() != new_value.asString())

2
indra/newview/llpanelmaininventory.cpp
View File

@ -675,7 +675,7 @@ void LLPanelMainInventory::onFilterTypeSelected(const std::string& filter_type_n
// invalid selection (broken XML?)
else
{
llwarns << "Invalid filter selection: " << filter_type_name << llendl;
LL_WARNS() << "Invalid filter selection: " << filter_type_name << LL_ENDL;
return;
}

10
indra/newview/llpanelobject.cpp
View File

@ -2567,7 +2567,7 @@ void LLPanelObject::onPastePosClip(const LLSD& data)
}
else
{
llinfos << "Couldn't get position vector from clipboard" << llendl;
LL_INFOS() << "Couldn't get position vector from clipboard" << LL_ENDL;
}
}
void LLPanelObject::onPasteSizeClip(const LLSD& data)
@ -2579,7 +2579,7 @@ void LLPanelObject::onPasteSizeClip(const LLSD& data)
}
else
{
llinfos << "Couldn't get size vector from clipboard" << llendl;
LL_INFOS() << "Couldn't get size vector from clipboard" << LL_ENDL;
}
}
void LLPanelObject::onPasteRotClip(const LLSD& data)
@ -2591,7 +2591,7 @@ void LLPanelObject::onPasteRotClip(const LLSD& data)
}
else
{
llinfos << "Couldn't get rotation vector from clipboard" << llendl;
LL_INFOS() << "Couldn't get rotation vector from clipboard" << LL_ENDL;
}
}
@ -2653,10 +2653,10 @@ void LLPanelObject::onCopyParams(const LLSD& data)
LLInventoryModel::INCLUDE_TRASH,
asset_id_matches);
if (items.count())
if (items.size())
{
// search for copyable version first
for (S32 i = 0; i < items.count(); i++)
for (S32 i = 0; i < items.size(); i++)
{
LLInventoryItem* itemp = items[i];
LLPermissions item_permissions = itemp->getPermissions();

8
indra/newview/llpanelopenregionsettings.cpp
View File

@ -50,18 +50,18 @@ class OpenRegionInfoUpdate : public LLHTTPNode
if (!input || !context || !input.isMap() || !input.has("body"))
{
llinfos << "malformed OpenRegionInfo update!" << llendl;
LL_INFOS() << "malformed OpenRegionInfo update!" << LL_ENDL;
return;
}
std::string dump = input["body"].asString();
llwarns << dump << llendl;
LL_WARNS() << dump << LL_ENDL;
LLWorld * regionlimits = LLWorld::getInstance();
LLSD body = input["body"];
//llinfos << "data: " << LLSDNotationStreamer(body) << llendl;
//llinfos << "data: " << LLSDXMLStreamer(body) << llendl;
//LL_INFOS() << "data: " << LLSDNotationStreamer(body) << LL_ENDL;
//LL_INFOS() << "data: " << LLSDXMLStreamer(body) << LL_ENDL;
//set the default limits/settings for this simulator type, as limits from our
//previous region may not exist in this one

2
indra/newview/llpanelpeople.cpp
View File

@ -1715,7 +1715,7 @@ void LLPanelPeople::onGlobalVisToggleButtonClicked()
if (relation == NULL)
{
// Lets have a warning log message instead of having a crash. EXT-4947.
llwarns << "Trying to modify rights for non-friend avatar. Skipped." << llendl;
LL_WARNS() << "Trying to modify rights for non-friend avatar. Skipped." << LL_ENDL;
return;
}

2
indra/newview/llpanelpermissions.cpp
View File

@ -91,7 +91,7 @@ bool is_asset_exportable(const LLUUID& asset_id)
LLAssetIDMatches asset_id_matches(asset_id);
gInventory.collectDescendentsIf(LLUUID::null, cats, items, true, asset_id_matches, false);
for (S32 i = 0; i < items.count(); ++i)
for (S32 i = 0; i < items.size(); ++i)
{
if (perms_allow_export(items[i]->getPermissions())) return true;
}

2
indra/newview/llpostcard.cpp
View File

@ -120,7 +120,7 @@ void LLPostCard::send(LLPointer<LLImageFormatted> image, const LLSD& postcard_da
// <FS:ND> Crashfix; image can end up being 0
if( image.isNull() )
{
llwarns << "Passed invalid image into LLPostcard::send() [0 pointer]" << llendl;
LL_WARNS() << "Passed invalid image into LLPostcard::send() [0 pointer]" << LL_ENDL;
return;
}
// </FS:ND>

12
indra/newview/llpreviewscript.cpp
View File

@ -362,7 +362,7 @@ BOOL LLScriptEdCore::postBuild()
// the tips one-per-line in strings.xml
LLStringUtil::replaceString( desc, ";", "\n" );
lldebugs << "Adding script library function: (" << name << ") with the desc '" << desc << "'" << llendl;
LL_DEBUGS() << "Adding script library function: (" << name << ") with the desc '" << desc << "'" << LL_ENDL;
// </FS:CR>
tooltips.push_back(desc);
@ -1214,7 +1214,7 @@ BOOL LLScriptEdCore::handleKeyHere(KEY key, MASK mask)
// NaCl - LSL Preprocessor
if (!hasChanged())
{
llinfos << "Save Not Needed" << llendl;
LL_INFOS() << "Save Not Needed" << LL_ENDL;
return TRUE;
}
doSave(FALSE);
@ -1365,7 +1365,7 @@ bool LLScriptEdContainer::onBackupTimer()
mBackupFilename = getBackupFileName();
mScriptEd->writeToFile(mBackupFilename, true);
llinfos << "Backing up script to " << mBackupFilename << llendl;
LL_INFOS() << "Backing up script to " << mBackupFilename << LL_ENDL;
}
return false;
}
@ -1720,7 +1720,7 @@ void LLPreviewLSL::uploadAssetLegacy(const std::string& filename,
const LLTransactionID& tid)
{
// <FS:CR> Remove LSO Compiler
llwarns << "Legacy LSO compile and upload is no longer supported" << llendl;
LL_WARNS() << "Legacy LSO compile and upload is no longer supported" << LL_ENDL;
#if 0
LLLineEditor* descEditor = getChild<LLLineEditor>("desc");
LLScriptSaveInfo* info = new LLScriptSaveInfo(item_id,
@ -2480,7 +2480,7 @@ void LLLiveLSLEditor::uploadAssetViaCapsStatic(const std::string& url,
LLSD body;
body["item_id"] = item_id;
body["target"] = is_mono.c_str();
llinfos << "Upload caps body=" << body << " url=" << url << " id= " << item_id << llendl;
LL_INFOS() << "Upload caps body=" << body << " url=" << url << " id= " << item_id << LL_ENDL;
LLHTTPClient::post(url, body,
new LLUpdateAgentInventoryResponder(body, filename, LLAssetType::AT_LSL_TEXT));
}
@ -2508,7 +2508,7 @@ void LLLiveLSLEditor::uploadAssetLegacy(const std::string& filename,
BOOL is_running)
{
// <FS:CR> Remove LSO compiler
llwarns << "Legacy LSO compile and upload is no longer supported" << llendl;
LL_WARNS() << "Legacy LSO compile and upload is no longer supported" << LL_ENDL;
#if 0
LLLiveLSLSaveData* data = new LLLiveLSLSaveData(mObjectUUID,
mItem,

2
indra/newview/llscriptfloater.cpp
View File

@ -973,7 +973,7 @@ LLScriptFloater* LLScriptFloater::show(const LLUUID& notification_id)
}
default:
{
llwarns << "dialogPos value " << dialogPos << " not handled in switch() statement." << llendl;
LL_WARNS() << "dialogPos value " << dialogPos << " not handled in switch() statement." << LL_ENDL;
}
}
}

2
indra/newview/llsecapi.cpp
View File

@ -56,7 +56,7 @@ void initializeSecHandler()
{
char aError[128];
ERR_error_string_n( lErr, aError, sizeof( aError ) );
llwarns << aError << llendl;
LL_WARNS() << aError << LL_ENDL;
lErr = ERR_get_error();
}

8
indra/newview/llspatialpartition.cpp
View File

@ -3899,13 +3899,13 @@ public:
else
{
i = branch->getDataBegin();
llwarns << "Warning, resetting data iterator to branch->getDataBegin due to tree change." << llendl;
LL_WARNS() << "Warning, resetting data iterator to branch->getDataBegin due to tree change." << LL_ENDL;
}
// FS:ND Can this really happen? I seriously hope not.
if( nodeObserver->getNodeIsDead() )
{
llwarns << "Warning, node died. Exiting iteration" << llendl;
LL_WARNS() << "Warning, node died. Exiting iteration" << LL_ENDL;
break;
}
@ -3968,13 +3968,13 @@ public:
else
{
++i;
llwarns << "Warning, child nodes changed during tree iteration." << llendl;
LL_WARNS() << "Warning, child nodes changed during tree iteration." << LL_ENDL;
}
// FS:ND Can this really happen? I seriously hope not.
if( nodeObserver->getNodeIsDead() )
{
llwarns << "Warning, node died. Exiting iteration" << llendl;
LL_WARNS() << "Warning, node died. Exiting iteration" << LL_ENDL;
break;
}

Some files were not shown because too many files have changed in this diff Show More