diff --git a/indra/llcommon/llstring.h b/indra/llcommon/llstring.h index 0177f48bf5..06c68688d4 100755 --- a/indra/llcommon/llstring.h +++ b/indra/llcommon/llstring.h @@ -35,6 +35,7 @@ #include #include #include "llformat.h" +#include "llsd.h" #if LL_LINUX || LL_SOLARIS #include diff --git a/indra/llimage/llimagetga.cpp b/indra/llimage/llimagetga.cpp index d234290b16..9a734d6d56 100755 --- a/indra/llimage/llimagetga.cpp +++ b/indra/llimage/llimagetga.cpp @@ -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 */ diff --git a/indra/llmath/lloctree.h b/indra/llmath/lloctree.h index 7e2baf527a..79c46e83a0 100755 --- a/indra/llmath/lloctree.h +++ b/indra/llmath/lloctree.h @@ -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; diff --git a/indra/llmessage/llurlrequest.cpp b/indra/llmessage/llurlrequest.cpp index 2613eb8ac5..37c1022ad8 100755 --- a/indra/llmessage/llurlrequest.cpp +++ b/indra/llmessage/llurlrequest.cpp @@ -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 ; } diff --git a/indra/llplugin/llpluginprocesschild.cpp b/indra/llplugin/llpluginprocesschild.cpp index 19b814bc35..a3eda29586 100755 --- a/indra/llplugin/llpluginprocesschild.cpp +++ b/indra/llplugin/llpluginprocesschild.cpp @@ -366,8 +366,8 @@ void LLPluginProcessChild::receiveMessageRaw(const std::string &message) // This is a new region // use smartptr - // LLPluginSharedMemory *region = new LLPluginSharedMemory; - LLPluginSharedMemoryPtr region( new LLPluginSharedMemory ); + LLPluginSharedMemory *region = new LLPluginSharedMemory; + //LLPluginSharedMemory region( new LLPluginSharedMemory ); // if(region->attach(name, size)) diff --git a/indra/llplugin/llpluginprocesschild.h b/indra/llplugin/llpluginprocesschild.h index 52f71e3b5b..9f1058f053 100755 --- a/indra/llplugin/llpluginprocesschild.h +++ b/indra/llplugin/llpluginprocesschild.h @@ -99,7 +99,7 @@ private: // Use boost::shred_ptr so LLPluginSharedMemory gets properly destroyed // typedef std::map sharedMemoryRegionsType; - typedef std::map sharedMemoryRegionsType; + typedef std::map sharedMemoryRegionsType; // sharedMemoryRegionsType mSharedMemoryRegions; diff --git a/indra/llplugin/llpluginprocessparent.cpp b/indra/llplugin/llpluginprocessparent.cpp index 6fbe994e6a..aad505c0ba 100755 --- a/indra/llplugin/llpluginprocessparent.cpp +++ b/indra/llplugin/llpluginprocessparent.cpp @@ -1003,8 +1003,8 @@ std::string LLPluginProcessParent::addSharedMemory(size_t size) std::string name; // Use smartptr - // LLPluginSharedMemory *region = new LLPluginSharedMemory; - LLPluginSharedMemoryPtr region( new LLPluginSharedMemory ); + LLPluginSharedMemory *region = new LLPluginSharedMemory; + //LLPluginSharedMemory region( new LLPluginSharedMemory ); // // This is a new region diff --git a/indra/llplugin/llpluginprocessparent.h b/indra/llplugin/llpluginprocessparent.h index 4be4843f39..7baffa5f76 100755 --- a/indra/llplugin/llpluginprocessparent.h +++ b/indra/llplugin/llpluginprocessparent.h @@ -162,7 +162,7 @@ private: // Use boost::shred_ptr so LLPluginSharedMemory gets properly destroyed // typedef std::map sharedMemoryRegionsType; - typedef std::map sharedMemoryRegionsType; + typedef std::map sharedMemoryRegionsType; // sharedMemoryRegionsType mSharedMemoryRegions; diff --git a/indra/llplugin/llpluginsharedmemory.h b/indra/llplugin/llpluginsharedmemory.h index 231d83c156..42f041b7b6 100755 --- a/indra/llplugin/llpluginsharedmemory.h +++ b/indra/llplugin/llpluginsharedmemory.h @@ -120,7 +120,7 @@ private: }; -typedef boost::shared_ptr< LLPluginSharedMemory > LLPluginSharedMemoryPtr; +//typedef boost::shared_ptr< LLPluginSharedMemory > LLPluginSharedMemoryPtr; #endif // LL_LLPLUGINSHAREDMEMORY_H diff --git a/indra/llrender/llfontgl.cpp b/indra/llrender/llfontgl.cpp index fdf920c8b7..50791f7be3 100755 --- a/indra/llrender/llfontgl.cpp +++ b/indra/llrender/llfontgl.cpp @@ -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; } } } diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp index 1558f137e6..1ca379f768 100755 --- a/indra/llrender/llfontregistry.cpp +++ b/indra/llrender/llfontregistry.cpp @@ -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; } diff --git a/indra/llrender/llfontregistry.h b/indra/llrender/llfontregistry.h index 946c940ecf..9ca0ef9134 100755 --- a/indra/llrender/llfontregistry.h +++ b/indra/llrender/llfontregistry.h @@ -73,6 +73,7 @@ public: // Load standard font info from XML file(s). bool parseFontInfo(const std::string& xml_filename); + //bool initFromXML(LLXMLNodePtr node); // Font selector // Clear cached glyphs for all fonts. void reset(); diff --git a/indra/llui/llbutton.cpp b/indra/llui/llbutton.cpp index fc4f4fb9ac..e39b2e0378 100755 --- a/indra/llui/llbutton.cpp +++ b/indra/llui/llbutton.cpp @@ -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; } } // diff --git a/indra/llui/llconsole.cpp b/indra/llui/llconsole.cpp index f2cee5fdbc..319e663100 100755 --- a/indra/llui/llconsole.cpp +++ b/indra/llui/llconsole.cpp @@ -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(); diff --git a/indra/llui/llfloaterreg.cpp b/indra/llui/llfloaterreg.cpp index 5772a3783f..ff74ba23a9 100755 --- a/indra/llui/llfloaterreg.cpp +++ b/indra/llui/llfloaterreg.cpp @@ -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); diff --git a/indra/llui/llkeywords.cpp b/indra/llui/llkeywords.cpp index c9a1b09038..b35441d52e 100755 --- a/indra/llui/llkeywords.cpp +++ b/indra/llui/llkeywords.cpp @@ -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()) diff --git a/indra/llui/lllayoutstack.cpp b/indra/llui/lllayoutstack.cpp index 74459303ef..37c8cf0cff 100755 --- a/indra/llui/lllayoutstack.cpp +++ b/indra/llui/lllayoutstack.cpp @@ -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(), diff --git a/indra/llui/llmenugl.cpp b/indra/llui/llmenugl.cpp index e0468bac8e..44f691f7a8 100755 --- a/indra/llui/llmenugl.cpp +++ b/indra/llui/llmenugl.cpp @@ -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; // } @@ -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; // } @@ -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 >(); diff --git a/indra/llui/llresmgr.cpp b/indra/llui/llresmgr.cpp index fbc718e906..8c3dbafce3 100755 --- a/indra/llui/llresmgr.cpp +++ b/indra/llui/llresmgr.cpp @@ -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()); diff --git a/indra/llui/llscrollcontainer.h b/indra/llui/llscrollcontainer.h index 1c7ff3f0a8..6395cb0f9b 100755 --- a/indra/llui/llscrollcontainer.h +++ b/indra/llui/llscrollcontainer.h @@ -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 }; // Scrollbar accessor struct Params : public LLInitParam::Block { diff --git a/indra/llui/llspinctrl.cpp b/indra/llui/llspinctrl.cpp index 8729ee1384..b55829b145 100755 --- a/indra/llui/llspinctrl.cpp +++ b/indra/llui/llspinctrl.cpp @@ -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(); diff --git a/indra/llvfs/lldir.cpp b/indra/llvfs/lldir.cpp index 1f40e388b2..551d4910b7 100755 --- a/indra/llvfs/lldir.cpp +++ b/indra/llvfs/lldir.cpp @@ -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] } diff --git a/indra/newview/NACLantispam.cpp b/indra/newview/NACLantispam.cpp index bf1f8736fe..027d9ccefc 100644 --- a/indra/newview/NACLantispam.cpp +++ b/indra/newview/NACLantispam.cpp @@ -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; } diff --git a/indra/newview/animationexplorer.cpp b/indra/newview/animationexplorer.cpp index d8db0f43c0..f62b206580 100644 --- a/indra/newview/animationexplorer.cpp +++ b/indra/newview/animationexplorer.cpp @@ -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" diff --git a/indra/newview/aoengine.cpp b/indra/newview/aoengine.cpp index f03afdeaa1..52f42aca30 100644 --- a/indra/newview/aoengine.cpp +++ b/indra/newview/aoengine.cpp @@ -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;indexcount();index++) + for(S32 index=0;indexsize();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;indexcount();index++) + for(S32 index=0;indexsize();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 item=items->get(index); + LLPointer 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;indexcount();index++) + for(S32 index=0;indexsize();index++) { std::vector 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;numcount();num++) + for(S32 num=0;numsize();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;indexcount();index++) + for(S32 index=0;indexsize();index++) { - LLViewerInventoryCategory* currentCategory=categories->get(index); + LLViewerInventoryCategory* currentCategory=categories->at(index); const std::string& setFolderName=currentCategory->getName(); std::vector 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;indexcount();index++) + for(S32 index=0;indexsize();index++) { std::vector 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;numcount() << " items " << items->count() << LL_ENDL; + LL_DEBUGS("AOEngine") << "cat " << categories->size() << " items " << items->size() << LL_ENDL; - for(S32 index=0;indexcount();index++) + for(S32 index=0;indexsize();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;indexsize();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 diff --git a/indra/newview/chatbar_as_cmdline.cpp b/indra/newview/chatbar_as_cmdline.cpp index bf9f50c2c6..d36b9086ec 100644 --- a/indra/newview/chatbar_as_cmdline.cpp +++ b/indra/newview/chatbar_as_cmdline.cpp @@ -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 lolstack; - LLDynamicArray > lolinv = findInventoryInFolder(mFolderName); - for(LLDynamicArray >::iterator it = lolinv.begin(); it != lolinv.end(); ++it) + std::vector > lolinv = findInventoryInFolder(mFolderName); + for(std::vector >::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 ids; + std::vector 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::iterator itr = ids.begin(); itr != ids.end(); ++itr) + for (std::vector::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 lolstack; - LLDynamicArray > lolinv = findInventoryInFolder(lolfolder); - for (LLDynamicArray >::iterator it = lolinv.begin(); it != lolinv.end(); ++it) + std::vector > lolinv = findInventoryInFolder(lolfolder); + for (std::vector >::iterator it = lolinv.begin(); it != lolinv.end(); ++it) { LLViewerInventoryItem* item = *it; lolstack.push(item); diff --git a/indra/newview/daeexport.cpp b/indra/newview/daeexport.cpp index 0c3a2a2f60..aaad9a3ca4 100644 --- a/indra/newview/daeexport.cpp +++ b/indra/newview/daeexport.cpp @@ -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(); diff --git a/indra/newview/dialogstack.cpp b/indra/newview/dialogstack.cpp index 28d46bddb4..9eacac3a04 100644 --- a/indra/newview/dialogstack.cpp +++ b/indra/newview/dialogstack.cpp @@ -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 { diff --git a/indra/newview/fschathistory.cpp b/indra/newview/fschathistory.cpp index c6565ef73b..e811037e50 100644 --- a/indra/newview/fschathistory.cpp +++ b/indra/newview/fschathistory.cpp @@ -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); diff --git a/indra/newview/fscommon.cpp b/indra/newview/fscommon.cpp index 5141d15bcd..b1738ca6e9 100644 --- a/indra/newview/fscommon.cpp +++ b/indra/newview/fscommon.cpp @@ -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); diff --git a/indra/newview/fsdata.cpp b/indra/newview/fsdata.cpp index 2dbc1c2619..a12bb48d44 100644 --- a/indra/newview/fsdata.cpp +++ b/indra/newview/fsdata.cpp @@ -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 ¬ification, 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 diff --git a/indra/newview/fsexportperms.cpp b/indra/newview/fsexportperms.cpp index 9cc16213df..5d57ea6735 100644 --- a/indra/newview/fsexportperms.cpp +++ b/indra/newview/fsexportperms.cpp @@ -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) { diff --git a/indra/newview/fsfloatercontacts.cpp b/indra/newview/fsfloatercontacts.cpp index cb41275f84..b2780c2391 100644 --- a/indra/newview/fsfloatercontacts.cpp +++ b/indra/newview/fsfloatercontacts.cpp @@ -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)); } diff --git a/indra/newview/fsfloaterexport.cpp b/indra/newview/fsfloaterexport.cpp index a9e9527a48..0aa02b5250 100644 --- a/indra/newview/fsfloaterexport.cpp +++ b/indra/newview/fsfloaterexport.cpp @@ -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(); diff --git a/indra/newview/fsfloatergrouptitles.cpp b/indra/newview/fsfloatergrouptitles.cpp index 1f1bdb2598..f9f4a0ff50 100644 --- a/indra/newview/fsfloatergrouptitles.cpp +++ b/indra/newview/fsfloatergrouptitles.cpp @@ -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); diff --git a/indra/newview/fsfloaterim.cpp b/indra/newview/fsfloaterim.cpp index dd3bf18173..a482457e9f 100644 --- a/indra/newview/fsfloaterim.cpp +++ b/indra/newview/fsfloaterim.cpp @@ -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); } diff --git a/indra/newview/fsfloaterimport.cpp b/indra/newview/fsfloaterimport.cpp index 969373284e..57856eaaf7 100644 --- a/indra/newview/fsfloaterimport.cpp +++ b/indra/newview/fsfloaterimport.cpp @@ -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(); diff --git a/indra/newview/fsfloaterplacedetails.cpp b/indra/newview/fsfloaterplacedetails.cpp index b75a5df5ac..d54087210e 100644 --- a/indra/newview/fsfloaterplacedetails.cpp +++ b/indra/newview/fsfloaterplacedetails.cpp @@ -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("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("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(NULL)); - llinfos << "Copied inventory item #" << mItem->getUUID() << " to favorites." << llendl; + LL_INFOS() << "Copied inventory item #" << mItem->getUUID() << " to favorites." << LL_ENDL; } } } diff --git a/indra/newview/fsfloatervoicecontrols.cpp b/indra/newview/fsfloatervoicecontrols.cpp index 7013f7ff21..bf882363c5 100644 --- a/indra/newview/fsfloatervoicecontrols.cpp +++ b/indra/newview/fsfloatervoicecontrols.cpp @@ -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; } } diff --git a/indra/newview/fsfloatervoicecontrols.h b/indra/newview/fsfloatervoicecontrols.h index 228cf5be33..31843b181f 100644 --- a/indra/newview/fsfloatervoicecontrols.h +++ b/indra/newview/fsfloatervoicecontrols.h @@ -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]; } diff --git a/indra/newview/fsgridhandler.cpp b/indra/newview/fsgridhandler.cpp index 1337158b4b..68ebf54451 100644 --- a/indra/newview/fsgridhandler.cpp +++ b/indra/newview/fsgridhandler.cpp @@ -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/"; } } diff --git a/indra/newview/fslightshare.cpp b/indra/newview/fslightshare.cpp index eb58d5ff0e..fb34dbdd94 100644 --- a/indra/newview/fslightshare.cpp +++ b/indra/newview/fslightshare.cpp @@ -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); } diff --git a/indra/newview/fslslbridge.cpp b/indra/newview/fslslbridge.cpp index 5376b22fb5..64b0902452 100644 --- a/indra/newview/fslslbridge.cpp +++ b/indra/newview/fslslbridge.cpp @@ -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()))) { diff --git a/indra/newview/fslslbridgerequest.cpp b/indra/newview/fslslbridgerequest.cpp index c7b42da479..c6a2e3e40d 100644 --- a/indra/newview/fslslbridgerequest.cpp +++ b/indra/newview/fslslbridgerequest.cpp @@ -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; } } } diff --git a/indra/newview/fslslpreproc.cpp b/indra/newview/fslslpreproc.cpp index 115534d312..5c8f22739c 100644 --- a/indra/newview/fslslpreproc.cpp +++ b/indra/newview/fslslpreproc.cpp @@ -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 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::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::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); } diff --git a/indra/newview/fsmoneytracker.cpp b/indra/newview/fsmoneytracker.cpp index 00c81d570e..b480379713 100644 --- a/indra/newview/fsmoneytracker.cpp +++ b/indra/newview/fsmoneytracker.cpp @@ -94,6 +94,6 @@ std::string FSMoneyTracker::appendTime() void FSMoneyTracker::clear() { - llinfos << "Cleared." << llendl; + LL_INFOS() << "Cleared." << LL_ENDL; mTransactionHistory->clear(); } diff --git a/indra/newview/fspanelprofile.cpp b/indra/newview/fspanelprofile.cpp index 9829450b64..1b0c2027ba 100644 --- a/indra/newview/fspanelprofile.cpp +++ b/indra/newview/fspanelprofile.cpp @@ -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 diff --git a/indra/newview/fspanelprofileclassifieds.cpp b/indra/newview/fspanelprofileclassifieds.cpp index 376815ed3f..75e83359ca 100644 --- a/indra/newview/fspanelprofileclassifieds.cpp +++ b/indra/newview/fspanelprofileclassifieds.cpp @@ -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" diff --git a/indra/newview/fsparticipantlist.cpp b/indra/newview/fsparticipantlist.cpp index 4600f228da..2383efbcf2 100644 --- a/indra/newview/fsparticipantlist.cpp +++ b/indra/newview/fsparticipantlist.cpp @@ -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 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(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; } diff --git a/indra/newview/fsradar.cpp b/indra/newview/fsradar.cpp index 66d3bb6584..fb35f373f6 100644 --- a/indra/newview/fsradar.cpp +++ b/indra/newview/fsradar.cpp @@ -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 diff --git a/indra/newview/fsradarlistctrl.cpp b/indra/newview/fsradarlistctrl.cpp index 46b85292ab..efd7d6e23b 100644 --- a/indra/newview/fsradarlistctrl.cpp +++ b/indra/newview/fsradarlistctrl.cpp @@ -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 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; diff --git a/indra/newview/fsscriptlibrary.cpp b/indra/newview/fsscriptlibrary.cpp index 2240c6a9ab..aa8533a044 100644 --- a/indra/newview/fsscriptlibrary.cpp +++ b/indra/newview/fsscriptlibrary.cpp @@ -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")) diff --git a/indra/newview/fsslurl.cpp b/indra/newview/fsslurl.cpp index dbd9b52cc4..c52ed79457 100644 --- a/indra/newview/fsslurl.cpp +++ b/indra/newview/fsslurl.cpp @@ -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. diff --git a/indra/newview/kcwlinterface.cpp b/indra/newview/kcwlinterface.cpp index a7b58c728f..d81324ffe7 100644 --- a/indra/newview/kcwlinterface.cpp +++ b/indra/newview/kcwlinterface.cpp @@ -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; } diff --git a/indra/newview/lggbeamcolormapfloater.cpp b/indra/newview/lggbeamcolormapfloater.cpp index d5fe729d2a..979181751f 100644 --- a/indra/newview/lggbeamcolormapfloater.cpp +++ b/indra/newview/lggbeamcolormapfloater.cpp @@ -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); } diff --git a/indra/newview/lggbeammapfloater.cpp b/indra/newview/lggbeammapfloater.cpp index 66088decc3..266ae6eceb 100644 --- a/indra/newview/lggbeammapfloater.cpp +++ b/indra/newview/lggbeammapfloater.cpp @@ -154,7 +154,7 @@ BOOL lggBeamMapFloater::handleMouseDown(S32 x,S32 y,MASK mask) a.c= getChild("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); diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 1e636c4859..de0429e8fc 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -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); } diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index d4f8fdfe93..4260f7b606 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -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); diff --git a/indra/newview/llagentwearablesfetch.cpp b/indra/newview/llagentwearablesfetch.cpp index b35889f9d8..86842ab098 100755 --- a/indra/newview/llagentwearablesfetch.cpp +++ b/indra/newview/llagentwearablesfetch.cpp @@ -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; // } // diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index ce324604b2..9e08e3b812 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -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 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() // 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()) { diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index ba62e07139..9e9056d9e6 100755 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -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; } // @@ -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; } // 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; } // @@ -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; } // @@ -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(); } // @@ -6504,7 +6504,7 @@ void LLAppViewer::handleLoginComplete() // // 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; } diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index 2a07bc99d2..85e5658c7e 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -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); diff --git a/indra/newview/llavatarlistitem.cpp b/indra/newview/llavatarlistitem.cpp index 9da68c0e42..8672912467 100755 --- a/indra/newview/llavatarlistitem.cpp +++ b/indra/newview/llavatarlistitem.cpp @@ -48,7 +48,7 @@ #include #include "llavatarpropertiesprocessor.h" #include "lldateutil.h" -#include "llavatarconstants.h" +//#include "llavatarconstants.h" #include "indra_constants.h" #include "llnotificationsutil.h" #include "llvoiceclient.h" diff --git a/indra/newview/llchiclet.cpp b/indra/newview/llchiclet.cpp index 95a42d2304..792bd7e11c 100755 --- a/indra/newview/llchiclet.cpp +++ b/indra/newview/llchiclet.cpp @@ -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 communication UI] diff --git a/indra/newview/llchicletbar.cpp b/indra/newview/llchicletbar.cpp index 8e843dc190..b13869c57f 100755 --- a/indra/newview/llchicletbar.cpp +++ b/indra/newview/llchicletbar.cpp @@ -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; } } diff --git a/indra/newview/llcompilequeue.cpp b/indra/newview/llcompilequeue.cpp index a99fe661e9..55edb2ecd9 100755 --- a/indra/newview/llcompilequeue.cpp +++ b/indra/newview/llcompilequeue.cpp @@ -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; } - // Remove LSO Compiler - llwarns << "Legacy LSO compile and upload is no longer supported" << llendl; -#if 0 -#endif // 0 // - ///---------------------------------------------------------------------------- /// 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 names; + std::vector names; LLInventoryObject::object_list_t::const_iterator it = inv->begin(); LLInventoryObject::object_list_t::const_iterator end = inv->end(); diff --git a/indra/newview/lldrawable.h b/indra/newview/lldrawable.h index 0445e1f8de..8871da24c9 100755 --- a/indra/newview/lldrawable.h +++ b/indra/newview/lldrawable.h @@ -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(); diff --git a/indra/newview/llenvmanager.cpp b/indra/newview/llenvmanager.cpp index 0f6c213aaf..9f2a1a8afd 100755 --- a/indra/newview/llenvmanager.cpp +++ b/indra/newview/llenvmanager.cpp @@ -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! diff --git a/indra/newview/lleventnotifier.cpp b/indra/newview/lleventnotifier.cpp index ae01cf53f4..0f4cecacb2 100755 --- a/indra/newview/lleventnotifier.cpp +++ b/indra/newview/lleventnotifier.cpp @@ -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; } diff --git a/indra/newview/llexternaleditor.cpp b/indra/newview/llexternaleditor.cpp index 8835ba6396..3fff003393 100755 --- a/indra/newview/llexternaleditor.cpp +++ b/indra/newview/llexternaleditor.cpp @@ -47,7 +47,7 @@ LLExternalEditor::EErrorCode LLExternalEditor::setCommand(const std::string& env LL_WARNS() << "Editor command is empty or not set" << LL_ENDL; // 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; } // diff --git a/indra/newview/llfavoritesbar.cpp b/indra/newview/llfavoritesbar.cpp index 1639548262..eec2f2a5e0 100755 --- a/indra/newview/llfavoritesbar.cpp +++ b/indra/newview/llfavoritesbar.cpp @@ -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; // @@ -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); diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 4dcc7625c2..7c1de47048 100755 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -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< diff --git a/indra/newview/llfloaterpreference.cpp b/indra/newview/llfloaterpreference.cpp index d53febb636..dc9eeb0830 100644 --- a/indra/newview/llfloaterpreference.cpp +++ b/indra/newview/llfloaterpreference.cpp @@ -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("GraphicsCardTextureMemory")->setMinValue(min_tex_mem); getChild("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); } // @@ -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; } diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index a4ebd63cdc..f2cd445ca5 100755 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -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; } } // Aurora Sim - Region Settings Console diff --git a/indra/newview/llfloaterscriptlimits.cpp b/indra/newview/llfloaterscriptlimits.cpp index 59515ef73c..b6bbaf9318 100755 --- a/indra/newview/llfloaterscriptlimits.cpp +++ b/indra/newview/llfloaterscriptlimits.cpp @@ -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; diff --git a/indra/newview/llfloatersettingsdebug.cpp b/indra/newview/llfloatersettingsdebug.cpp index 5a93c3a134..86352ebc73 100755 --- a/indra/newview/llfloatersettingsdebug.cpp +++ b/indra/newview/llfloatersettingsdebug.cpp @@ -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" diff --git a/indra/newview/llfloatersnapshot.cpp b/indra/newview/llfloatersnapshot.cpp index ef49a93dc7..98834ee12f 100755 --- a/indra/newview/llfloatersnapshot.cpp +++ b/indra/newview/llfloatersnapshot.cpp @@ -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("panel_tab_container")->getCurrentPanel(); if(!panel) { - llwarns << "no active snapshot destination found" << llendl; + LL_WARNS() << "no active snapshot destination found" << LL_ENDL; return; } diff --git a/indra/newview/llfloaterworldmap.cpp b/indra/newview/llfloaterworldmap.cpp index 889231cad5..db224210d6 100644 --- a/indra/newview/llfloaterworldmap.cpp +++ b/indra/newview/llfloaterworldmap.cpp @@ -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; } } // Parcel details on map diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index c1da1cb8da..793c31a744 100755 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -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")) { diff --git a/indra/newview/llinspectavatar.cpp b/indra/newview/llinspectavatar.cpp index 9252ece1bc..3397d70f05 100755 --- a/indra/newview/llinspectavatar.cpp +++ b/indra/newview/llinspectavatar.cpp @@ -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 ) { diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index e1ccb03707..5e820b3981 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -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; jgetItemID()); - //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(); diff --git a/indra/newview/llinventorymodel.h b/indra/newview/llinventorymodel.h index ce6c6e9dfc..a320da9667 100755 --- a/indra/newview/llinventorymodel.h +++ b/indra/newview/llinventorymodel.h @@ -136,7 +136,7 @@ private: // ReplaceWornItemsOnly item_array_t mItemArray; item_array_t mObjArray; - LLDynamicArray mAttPoints; + std::vector mAttPoints; // //-------------------------------------------------------------------- diff --git a/indra/newview/llinventorymodelbackgroundfetch.cpp b/indra/newview/llinventorymodelbackgroundfetch.cpp index 26f0811634..cc36300003 100755 --- a/indra/newview/llinventorymodelbackgroundfetch.cpp +++ b/indra/newview/llinventorymodelbackgroundfetch.cpp @@ -756,7 +756,7 @@ void LLInventoryModelBackgroundFetch::bulkFetch() // //{ else { - llwarns << "FIXME! no FetchInventory2 capability" << llendl; + LL_WARNS() << "FIXME! no FetchInventory2 capability" << LL_ENDL; // // LLMessageSystem* msg = gMessageSystem; // msg->newMessage("FetchInventory"); diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp index 2cbf9bb8b6..26643d8671 100755 --- a/indra/newview/llinventoryobserver.cpp +++ b/indra/newview/llinventoryobserver.cpp @@ -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); diff --git a/indra/newview/lloutfitslist.cpp b/indra/newview/lloutfitslist.cpp index d20bda7511..5afe4a843b 100755 --- a/indra/newview/lloutfitslist.cpp +++ b/indra/newview/lloutfitslist.cpp @@ -498,13 +498,13 @@ void LLOutfitsList::refreshList(const LLUUID& category_id) // 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; } // @@ -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) diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp index ef073b6ece..043e621b41 100755 --- a/indra/newview/llpanelface.cpp +++ b/indra/newview/llpanelface.cpp @@ -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; diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp index f4f1282f8c..b47459f02b 100755 --- a/indra/newview/llpanelgroupgeneral.cpp +++ b/indra/newview/llpanelgroupgeneral.cpp @@ -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 diff --git a/indra/newview/llpanelgrouplandmoney.cpp b/indra/newview/llpanelgrouplandmoney.cpp index f94775fd84..c353631dea 100755 --- a/indra/newview/llpanelgrouplandmoney.cpp +++ b/indra/newview/llpanelgrouplandmoney.cpp @@ -826,7 +826,7 @@ void LLPanelGroupLandMoney::processPlacesReply(LLMessageSystem* msg, void**) if(found_it == sGroupIDs.end()) { // - 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." // << LL_ENDL; diff --git a/indra/newview/llpanellandaudio.cpp b/indra/newview/llpanellandaudio.cpp index 13f87c28dd..d05fbb1e47 100755 --- a/indra/newview/llpanellandaudio.cpp +++ b/indra/newview/llpanellandaudio.cpp @@ -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); diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 96743ebf04..f66a9d55c5 100755 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -1402,7 +1402,7 @@ void LLPanelLogin::gridListChanged(bool success) void LLPanelLogin::onModeChange(const LLSD& original_value, const LLSD& new_value) { // 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()) diff --git a/indra/newview/llpanelmaininventory.cpp b/indra/newview/llpanelmaininventory.cpp index 261902e000..38afe80145 100755 --- a/indra/newview/llpanelmaininventory.cpp +++ b/indra/newview/llpanelmaininventory.cpp @@ -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; } diff --git a/indra/newview/llpanelobject.cpp b/indra/newview/llpanelobject.cpp index 0bbe1ec04c..eaeeffcb3f 100755 --- a/indra/newview/llpanelobject.cpp +++ b/indra/newview/llpanelobject.cpp @@ -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(); diff --git a/indra/newview/llpanelopenregionsettings.cpp b/indra/newview/llpanelopenregionsettings.cpp index 2049b887c7..3a9db841fc 100644 --- a/indra/newview/llpanelopenregionsettings.cpp +++ b/indra/newview/llpanelopenregionsettings.cpp @@ -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 diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 3a801ab099..24c4f89231 100755 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -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; } diff --git a/indra/newview/llpanelpermissions.cpp b/indra/newview/llpanelpermissions.cpp index 38ecda7e0a..b7887c2a9e 100755 --- a/indra/newview/llpanelpermissions.cpp +++ b/indra/newview/llpanelpermissions.cpp @@ -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; } diff --git a/indra/newview/llpostcard.cpp b/indra/newview/llpostcard.cpp index 9ba404abd6..2b21f36d23 100755 --- a/indra/newview/llpostcard.cpp +++ b/indra/newview/llpostcard.cpp @@ -120,7 +120,7 @@ void LLPostCard::send(LLPointer image, const LLSD& postcard_da // 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; } // diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index e52b8d2527..4f881d1ef0 100755 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -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; // 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) { // 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("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) { // 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, diff --git a/indra/newview/llscriptfloater.cpp b/indra/newview/llscriptfloater.cpp index 60a7a895cf..7162306fcf 100755 --- a/indra/newview/llscriptfloater.cpp +++ b/indra/newview/llscriptfloater.cpp @@ -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; } } } diff --git a/indra/newview/llsecapi.cpp b/indra/newview/llsecapi.cpp index 49f5b95adf..7e25b51947 100755 --- a/indra/newview/llsecapi.cpp +++ b/indra/newview/llsecapi.cpp @@ -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(); } diff --git a/indra/newview/llspatialpartition.cpp b/indra/newview/llspatialpartition.cpp index 2b01a940ed..2576188d18 100755 --- a/indra/newview/llspatialpartition.cpp +++ b/indra/newview/llspatialpartition.cpp @@ -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; } diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index abf7e6ccf9..cfa9850d01 100755 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -350,7 +350,7 @@ public: out_file.open(filename); LLSDSerialize::toPrettyXML(content, out_file); out_file.close(); - llinfos << "GridListRequest: got new list." << llendl; + LL_INFOS() << "GridListRequest: got new list." << LL_ENDL; sGridListRequestReady = true; } @@ -363,7 +363,7 @@ public: LL_DEBUGS("GridManager") << "<- no error :P ... GridListRequest: List not modified since last session" << LL_ENDL; } else - llwarns << "GridListRequest::error("<< status << ": " << reason << ")" << llendl; + LL_WARNS() << "GridListRequest::error("<< status << ": " << reason << ")" << LL_ENDL; } }; // @@ -2003,11 +2003,11 @@ LLWorld::getInstance()->addRegion(gFirstSimHandle, gFirstSim, first_sim_size_x, // from the money balance request and mutelist request // seem to get lost under certain conditions // request mute list - llinfos << "Requesting Mute List" << llendl; + LL_INFOS() << "Requesting Mute List" << LL_ENDL; LLMuteList::getInstance()->requestFromServer(gAgent.getID()); display_startup(); // Get L$ and ownership credit information - llinfos << "Requesting Money Balance" << llendl; + LL_INFOS() << "Requesting Money Balance" << LL_ENDL; LLStatusBar::sendMoneyBalanceRequest(); display_startup(); @@ -4092,12 +4092,12 @@ bool process_login_success_response(U32 &first_sim_size_x, U32 &first_sim_size_y if(response.has("currency")) { currency = response["currency"].asString(); - LL_DEBUGS("OS_SETTINGS") << "currency " << currency << llendl; + LL_DEBUGS("OS_SETTINGS") << "currency " << currency << LL_ENDL; } else if (LLGridManager::getInstance()->isInOpenSim()) { currency = "OS$"; - LL_DEBUGS("OS_SETTINGS") << "no currency in login response" << llendl; + LL_DEBUGS("OS_SETTINGS") << "no currency in login response" << LL_ENDL; } Tea::setCurrency(currency); // @@ -4105,20 +4105,20 @@ bool process_login_success_response(U32 &first_sim_size_x, U32 &first_sim_size_y // if(response.has("avatar_picker_url")) { - LL_DEBUGS("OS_SETTINGS") << "avatar_picker_url " << response["avatar_picker_url"] << llendl; + LL_DEBUGS("OS_SETTINGS") << "avatar_picker_url " << response["avatar_picker_url"] << LL_ENDL; } else if (LLGridManager::getInstance()->isInOpenSim()) { - LL_DEBUGS("OS_SETTINGS") << "no avatar_picker_url in login response" << llendl; + LL_DEBUGS("OS_SETTINGS") << "no avatar_picker_url in login response" << LL_ENDL; } if(response.has("destination_guide_url")) { - LL_DEBUGS("OS_SETTINGS") << "destination_guide_url " << response["destination_guide_url"] << llendl; + LL_DEBUGS("OS_SETTINGS") << "destination_guide_url " << response["destination_guide_url"] << LL_ENDL; } else if (LLGridManager::getInstance()->isInOpenSim()) { - LL_DEBUGS("OS_SETTINGS") << "no destination_guide_url in login response" << llendl; + LL_DEBUGS("OS_SETTINGS") << "no destination_guide_url in login response" << LL_ENDL; } // diff --git a/indra/newview/llsyswellwindow.cpp b/indra/newview/llsyswellwindow.cpp index 428092cd94..830b07babb 100755 --- a/indra/newview/llsyswellwindow.cpp +++ b/indra/newview/llsyswellwindow.cpp @@ -741,10 +741,10 @@ void LLIMWellWindow::addIMRow(const LLUUID& sessionId, S32 chicletCounter, } else { - llwarns << "Unable to add IM Row into the list, sessionID: " << sessionId + LL_WARNS() << "Unable to add IM Row into the list, sessionID: " << sessionId << ", name: " << name << ", other participant ID: " << otherParticipantId - << llendl; + << LL_ENDL; item->die(); } @@ -766,8 +766,8 @@ void LLIMWellWindow::delIMRow(const LLUUID& sessionId) } else { - llwarns << "Unable to remove IM Row from the list, sessionID: " << sessionId - << llendl; + LL_WARNS() << "Unable to remove IM Row from the list, sessionID: " << sessionId + << LL_ENDL; } // remove all toasts that belong to this session from a screen diff --git a/indra/newview/lltexturefetch.cpp b/indra/newview/lltexturefetch.cpp index b382c8f911..88b323593b 100755 --- a/indra/newview/lltexturefetch.cpp +++ b/indra/newview/lltexturefetch.cpp @@ -1131,7 +1131,7 @@ bool LLTextureFetchWorker::doWork(S32 param) //asset blacklist if(FSWSAssetBlacklist::getInstance()->isBlacklisted(mID,LLAssetType::AT_TEXTURE)) { - llinfos << "Blacklisted texture asset blocked." << llendl; + LL_INFOS() << "Blacklisted texture asset blocked." << LL_ENDL; mState = DONE; return true; } diff --git a/indra/newview/lltoolface.cpp b/indra/newview/lltoolface.cpp index b513d3a7fa..ac2700949a 100755 --- a/indra/newview/lltoolface.cpp +++ b/indra/newview/lltoolface.cpp @@ -324,7 +324,7 @@ void LLToolFace::render() return; } - llwarns << x << " " << y << " " << pick.mSTCoords.mV[VX] << " " << pick.mSTCoords.mV[VY] << llendl; + LL_WARNS() << x << " " << y << " " << pick.mSTCoords.mV[VX] << " " << pick.mSTCoords.mV[VY] << LL_ENDL; */ // this is another way I would rather do it than tracking mouse deltas, because it diff --git a/indra/newview/llvieweraudio.cpp b/indra/newview/llvieweraudio.cpp index 242fa2d7b3..ead4bc7cbb 100755 --- a/indra/newview/llvieweraudio.cpp +++ b/indra/newview/llvieweraudio.cpp @@ -91,7 +91,7 @@ void LLViewerAudio::startInternetStreamWithAutoFade(std::string streamURI) /// FIRE-8419 - Don't return here. It can keep the user from toggling audio streams off/on. /// We handle identical stream URIs with FIRE-7093 anyways. //return; - lldebugs << "Identical URI's: " << mNextStreamURI << " and " << streamURI << llendl; + LL_DEBUGS() << "Identical URI's: " << mNextStreamURI << " and " << streamURI << LL_ENDL; // } diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index dc5ea44542..9f0c06836b 100755 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -6938,7 +6938,7 @@ void handle_script_info() if (LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()) { object_id = LLSelectMgr::getInstance()->getSelection()->getPrimaryObject()->mID; - llinfos << "Reporting Script Info for object: " << object_id.asString() << llendl; + LL_INFOS() << "Reporting Script Info for object: " << object_id.asString() << LL_ENDL; FSLSLBridge::instance().viewerToLSL("getScriptInfo|" + object_id.asString()); } } @@ -7334,7 +7334,7 @@ class LLShowHelp : public view_listener_t { LLWeb::loadURLInternal(url); } - lldebugs << "grid_help " << help_topic << " url " << url << llendl; + LL_DEBUGS() << "grid_help " << help_topic << " url " << url << LL_ENDL; return true; } @@ -9072,7 +9072,7 @@ class FSStreamListExportXML :public view_listener_t LLNotificationsUtil::add("StreamListExportSuccess", args); } else - llinfos << "User closed the filepicker. Aborting!" << llendl; + LL_INFOS() << "User closed the filepicker. Aborting!" << LL_ENDL; return true; } @@ -9089,7 +9089,7 @@ class FSStreamListImportXML :public view_listener_t llifstream stream_list(filename); if(!stream_list.is_open()) { - llwarns << "Couldn't open the xml file for reading. Aborting import!" << llendl; + LL_WARNS() << "Couldn't open the xml file for reading. Aborting import!" << LL_ENDL; return true; } LLSD stream_data; diff --git a/indra/newview/llviewermenufile.cpp b/indra/newview/llviewermenufile.cpp index 914a025756..acb520c2ac 100755 --- a/indra/newview/llviewermenufile.cpp +++ b/indra/newview/llviewermenufile.cpp @@ -466,7 +466,7 @@ static void show_floater_callback(const std::string& floater, const std::string& std::string error_msg; if (check_for_invalid_wav_formats(filename,error_msg)) { - llinfos << error_msg << ": " << filename << llendl; + LL_INFOS() << error_msg << ": " << filename << LL_ENDL; LLSD args; args["FILE"] = filename; LLNotificationsUtil::add( error_msg, args ); diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index f7cf589f62..f620b243d1 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -725,7 +725,7 @@ bool join_group_response(const LLSD& notification, const LLSD& response) // [CR] FIRE-12229 //if(gAgent.mGroups.size() < max_groups) - if(!max_groups || gAgent.mGroups.count() < max_groups) + if(!max_groups || gAgent.mGroups.size() < max_groups) // [/CR] FIRE-12229 { accept_invite = true; @@ -7224,11 +7224,11 @@ bool attempt_standard_notification(LLMessageSystem* msgsystem) snap_filename += SCREEN_HOME_FILENAME; if (gViewerWindow->saveSnapshot(snap_filename, gViewerWindow->getWindowWidthRaw(), gViewerWindow->getWindowHeightRaw(), FALSE, FALSE)) { - llinfos << SCREEN_HOME_FILENAME << " saved successfully." << llendl; + LL_INFOS() << SCREEN_HOME_FILENAME << " saved successfully." << LL_ENDL; } else { - llwarns << SCREEN_HOME_FILENAME << " could not be saved." << llendl; + LL_WARNS() << SCREEN_HOME_FILENAME << " could not be saved." << LL_ENDL; } } // @@ -8262,7 +8262,7 @@ void process_teleport_failed(LLMessageSystem *msg, void**) // Stop typing after teleport (possible fix for FIRE-7273) gAgent.stopTyping(); - llinfos << "Teleport error, reason=" << reason << llendl; + LL_INFOS() << "Teleport error, reason=" << reason << LL_ENDL; if (!FSLSLBridge::instance().canUseBridge() || (reason != "Could not teleport closer to destination")) { diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index 7dbdc0ce12..d31b53cdbb 100755 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -3007,7 +3007,7 @@ void LLViewerObject::processTaskInvFile(void** user_data, S32 error_code, LLExtS // Crashfix, not sure why object->mInventory can be 0 if( !object->mInventory ) { - llwarns << "object->mInventory == 0" << llendl; + LL_WARNS() << "object->mInventory == 0" << LL_ENDL; delete ft; return; } diff --git a/indra/newview/llviewerobject.h b/indra/newview/llviewerobject.h index 8871c30b61..d8b88b394a 100755 --- a/indra/newview/llviewerobject.h +++ b/indra/newview/llviewerobject.h @@ -413,7 +413,7 @@ public: void clearIcon(); // Getter for HUD icon attached to the object - LLPointer getIcon() const { return mIcon; }; + //LLPointer getIcon() const { return mIcon; }; void markForUpdate(BOOL priority); void updateVolume(const LLVolumeParams& volume_params); diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index d1e75017b5..3b4f65602f 100755 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -634,7 +634,7 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys, if(FSWSAssetBlacklist::getInstance()->isBlacklisted(fullid,LLAssetType::AT_OBJECT)) { - llinfos << "Blacklisted object blocked." << llendl; + LL_INFOS() << "Blacklisted object blocked." << LL_ENDL; continue; } diff --git a/indra/newview/llviewerparcelmedia.cpp b/indra/newview/llviewerparcelmedia.cpp index ef8cb6550d..50f3ddaaaf 100755 --- a/indra/newview/llviewerparcelmedia.cpp +++ b/indra/newview/llviewerparcelmedia.cpp @@ -177,7 +177,7 @@ void LLViewerParcelMedia::update(LLParcel* parcel) { if (gSavedSettings.getBOOL("MediaEnableFilter")) { - llinfos << "Filtering media URL." << llendl; + LL_INFOS() << "Filtering media URL." << LL_ENDL; filterMediaUrl(parcel); } else @@ -426,7 +426,7 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg } else { - llinfos << "Queueing PARCEL_MEDIA_STOP command." << llendl; + LL_INFOS() << "Queueing PARCEL_MEDIA_STOP command." << LL_ENDL; sMediaCommandQueue = PARCEL_MEDIA_COMMAND_STOP; } } @@ -440,7 +440,7 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg } else { - llinfos << "Queueing PARCEL_MEDIA_PAUSE command." << llendl; + LL_INFOS() << "Queueing PARCEL_MEDIA_PAUSE command." << LL_ENDL; sMediaCommandQueue = PARCEL_MEDIA_COMMAND_PAUSE; } } @@ -458,14 +458,14 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg //AO: Disallow scripted media option if (( !gSavedSettings.getBOOL("PermAllowScriptedMedia")) && (!gSavedSettings.getBOOL("TempAllowScriptedMedia"))) { - llinfos << "Disallowing scripted media." <getAgentParcel(); if (gSavedSettings.getBOOL("MediaEnableFilter")) { - llinfos << "PARCEL_MEDIA_COMMAND_PLAY: Filtering media URL." << llendl; + LL_INFOS() << "PARCEL_MEDIA_COMMAND_PLAY: Filtering media URL." << LL_ENDL; filterMediaUrl(parcel); } else @@ -485,7 +485,7 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg } else { - llinfos << "Queueing PARCEL_MEDIA_UNLOAD command." << llendl; + LL_INFOS() << "Queueing PARCEL_MEDIA_UNLOAD command." << LL_ENDL; sMediaCommandQueue = PARCEL_MEDIA_COMMAND_UNLOAD; } } @@ -498,14 +498,14 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg //AO: Disallow scripted media option if (( !gSavedSettings.getBOOL("PermAllowScriptedMedia")) && (!gSavedSettings.getBOOL("TempAllowScriptedMedia"))) { - llinfos << "Disallowing scripted media." << llendl; + LL_INFOS() << "Disallowing scripted media." << LL_ENDL; } else { LLParcel *parcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); if (gSavedSettings.getBOOL("MediaEnableFilter")) { - llinfos << "PARCEL_MEDIA_COMMAND_TIME: Filtering media URL." << llendl; + LL_INFOS() << "PARCEL_MEDIA_COMMAND_TIME: Filtering media URL." << LL_ENDL; filterMediaUrl(parcel); } else @@ -520,7 +520,7 @@ void LLViewerParcelMedia::processParcelMediaCommandMessage( LLMessageSystem *msg } else { - llinfos << "Queueing PARCEL_MEDIA_TIME command." << llendl; + LL_INFOS() << "Queueing PARCEL_MEDIA_TIME command." << LL_ENDL; sMediaCommandQueue = PARCEL_MEDIA_COMMAND_TIME; sMediaCommandTime = time; } @@ -582,7 +582,7 @@ void LLViewerParcelMedia::processParcelMediaUpdate( LLMessageSystem *msg, void * { if (gSavedSettings.getBOOL("MediaEnableFilter")) { - llinfos << "Parcel media changed. Filtering media URL." << llendl; + LL_INFOS() << "Parcel media changed. Filtering media URL." << LL_ENDL; filterMediaUrl(parcel); } else @@ -803,8 +803,8 @@ void LLViewerParcelMedia::filterMediaUrl(LLParcel* parcel) LLParcel *currentparcel = LLViewerParcelMgr::getInstance()->getAgentParcel(); - llinfos << "Current media: "+sCurrentMedia.getMediaURL() << llendl; - llinfos << "New media: "+parcel->getMediaURL() << llendl; + LL_INFOS() << "Current media: "+sCurrentMedia.getMediaURL() << LL_ENDL; + LL_INFOS() << "New media: "+parcel->getMediaURL() << LL_ENDL; // If there is no alert active, filter the media and flag media // queue empty. if (LLViewerParcelMedia::sMediaFilterAlertActive == false) @@ -812,7 +812,7 @@ void LLViewerParcelMedia::filterMediaUrl(LLParcel* parcel) if ((parcel->getMediaURL() == sCurrentMedia.getMediaURL()) && (!sMediaReFilter)) { - llinfos << "Media URL filter: no active alert, same URL as previous: " +parcel->getMediaURL() << llendl; + LL_INFOS() << "Media URL filter: no active alert, same URL as previous: " +parcel->getMediaURL() << LL_ENDL; sCurrentMedia = *parcel; if ((parcel->getName() == currentparcel->getName()) && sMediaLastActionPlay) @@ -823,7 +823,7 @@ void LLViewerParcelMedia::filterMediaUrl(LLParcel* parcel) sMediaQueueEmpty = true; return; } - llinfos << "Media URL filter: no active alert, filtering new URL: "+parcel->getMediaURL() << llendl; + LL_INFOS() << "Media URL filter: no active alert, filtering new URL: "+parcel->getMediaURL() << LL_ENDL; sMediaQueueEmpty = true; } // If an alert is active, place the media in the media queue if not the same as previous request @@ -833,7 +833,7 @@ void LLViewerParcelMedia::filterMediaUrl(LLParcel* parcel) { if (parcel->getMediaURL() != sQueuedMedia.getMediaURL()) { - llinfos << "Media URL filter: active alert, replacing current queued media URL with: "+sQueuedMedia.getMediaURL() << llendl; + LL_INFOS() << "Media URL filter: active alert, replacing current queued media URL with: "+sQueuedMedia.getMediaURL() << LL_ENDL; sQueuedMedia = *parcel; sMediaQueueEmpty = false; } @@ -844,7 +844,7 @@ void LLViewerParcelMedia::filterMediaUrl(LLParcel* parcel) { if (parcel->getMediaURL() != sCurrentMedia.getMediaURL()) { - llinfos << "Media URL filter: active alert, nothing queued, adding new queued media URL: "+sQueuedMedia.getMediaURL() << llendl; + LL_INFOS() << "Media URL filter: active alert, nothing queued, adding new queued media URL: "+sQueuedMedia.getMediaURL() << LL_ENDL; sQueuedMedia = *parcel; sMediaQueueEmpty = false; } @@ -1081,22 +1081,22 @@ void callback_media_alert2(const LLSD ¬ification, const LLSD &response, LLPar // There's a queued media command. Process it. if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_STOP) { - llinfos << "Executing Queued PARCEL_MEDIA_STOP command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_STOP command." << LL_ENDL; LLViewerParcelMedia::stop(); } else if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_PAUSE) { - llinfos << "Executing Queued PARCEL_MEDIA_PAUSE command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_PAUSE command." << LL_ENDL; LLViewerParcelMedia::pause(); } else if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_UNLOAD) { - llinfos << "Executing Queued PARCEL_MEDIA_UNLOAD command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_UNLOAD command." << LL_ENDL; LLViewerParcelMedia::stop(); } else if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_TIME) { - llinfos << "Executing Queued PARCEL_MEDIA_TIME command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_TIME command." << LL_ENDL; LLViewerParcelMedia::seek(LLViewerParcelMedia::sMediaCommandTime); } LLViewerParcelMedia::sMediaCommandQueue = 0; @@ -1178,22 +1178,22 @@ void callback_media_alert_single(const LLSD ¬ification, const LLSD &response, // There's a queued media command. Process it. if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_STOP) { - llinfos << "Executing Queued PARCEL_MEDIA_STOP command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_STOP command." << LL_ENDL; LLViewerParcelMedia::stop(); } else if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_PAUSE) { - llinfos << "Executing Queued PARCEL_MEDIA_PAUSE command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_PAUSE command." << LL_ENDL; LLViewerParcelMedia::pause(); } else if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_UNLOAD) { - llinfos << "Executing Queued PARCEL_MEDIA_UNLOAD command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_UNLOAD command." << LL_ENDL; LLViewerParcelMedia::stop(); } else if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_TIME) { - llinfos << "Executing Queued PARCEL_MEDIA_TIME command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_TIME command." << LL_ENDL; LLViewerParcelMedia::seek(LLViewerParcelMedia::sMediaCommandTime); } LLViewerParcelMedia::sMediaCommandQueue = 0; @@ -1238,7 +1238,7 @@ void LLViewerParcelMedia::filterAudioUrl(std::string media_url) if ((media_url == sCurrentMusic) && (!sMediaReFilter)) { - llinfos << "Audio URL filter: no active alert, same URL as previous: " + media_url << llendl; + LL_INFOS() << "Audio URL filter: no active alert, same URL as previous: " + media_url << LL_ENDL; // The music hasn't changed, so keep playing if we were. if ((gAudiop != NULL) && sAudioLastActionPlay) { @@ -1248,7 +1248,7 @@ void LLViewerParcelMedia::filterAudioUrl(std::string media_url) return; } // New music, so flag the queue empty and filter it. - llinfos << "Audio URL filter: no active alert, filtering new URL: " + media_url << llendl; + LL_INFOS() << "Audio URL filter: no active alert, filtering new URL: " + media_url << LL_ENDL; sMusicQueueEmpty = true; } // If an alert is active, place the media url in the music queue @@ -1259,7 +1259,7 @@ void LLViewerParcelMedia::filterAudioUrl(std::string media_url) { if (media_url != sQueuedMusic) { - llinfos << "Audio URL filter: active alert, replacing existing queue with: " + media_url << llendl; + LL_INFOS() << "Audio URL filter: active alert, replacing existing queue with: " + media_url << LL_ENDL; sQueuedMusic = media_url; sMusicQueueEmpty = false; } @@ -1270,7 +1270,7 @@ void LLViewerParcelMedia::filterAudioUrl(std::string media_url) { if (media_url != sCurrentMusic) { - llinfos << "Audio URL filter: active alert, nothing queued, adding queue with: " + media_url << llendl; + LL_INFOS() << "Audio URL filter: active alert, nothing queued, adding queue with: " + media_url << LL_ENDL; sQueuedMusic = media_url; sMusicQueueEmpty = false; } @@ -1512,22 +1512,22 @@ void callback_audio_alert2(const LLSD ¬ification, const LLSD &response, std:: // There's a queued media command. Process it. if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_STOP) { - llinfos << "Executing Queued PARCEL_MEDIA_STOP command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_STOP command." << LL_ENDL; LLViewerParcelMedia::stop(); } else if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_PAUSE) { - llinfos << "Executing Queued PARCEL_MEDIA_PAUSE command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_PAUSE command." << LL_ENDL; LLViewerParcelMedia::pause(); } else if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_UNLOAD) { - llinfos << "Executing Queued PARCEL_MEDIA_UNLOAD command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_UNLOAD command." << LL_ENDL; LLViewerParcelMedia::stop(); } else if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_TIME) { - llinfos << "Executing Queued PARCEL_MEDIA_TIME command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_TIME command." << LL_ENDL; LLViewerParcelMedia::seek(LLViewerParcelMedia::sMediaCommandTime); } LLViewerParcelMedia::sMediaCommandQueue = 0; @@ -1615,22 +1615,22 @@ void callback_audio_alert_single(const LLSD ¬ification, const LLSD &response, // There's a queued media command. Process it. if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_STOP) { - llinfos << "Executing Queued PARCEL_MEDIA_STOP command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_STOP command." << LL_ENDL; LLViewerParcelMedia::stop(); } else if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_PAUSE) { - llinfos << "Executing Queued PARCEL_MEDIA_PAUSE command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_PAUSE command." << LL_ENDL; LLViewerParcelMedia::pause(); } else if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_UNLOAD) { - llinfos << "Executing Queued PARCEL_MEDIA_UNLOAD command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_UNLOAD command." << LL_ENDL; LLViewerParcelMedia::stop(); } else if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_TIME) { - llinfos << "Executing Queued PARCEL_MEDIA_TIME command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_TIME command." << LL_ENDL; LLViewerParcelMedia::seek(LLViewerParcelMedia::sMediaCommandTime); } LLViewerParcelMedia::sMediaCommandQueue = 0; @@ -1917,22 +1917,22 @@ void callback_MOAP_alert2(const LLSD ¬ification, const LLSD &response, LLMedi // There's a queued media command. Process it. if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_STOP) { - llinfos << "Executing Queued PARCEL_MEDIA_STOP command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_STOP command." << LL_ENDL; LLViewerParcelMedia::stop(); } else if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_PAUSE) { - llinfos << "Executing Queued PARCEL_MEDIA_PAUSE command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_PAUSE command." << LL_ENDL; LLViewerParcelMedia::pause(); } else if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_UNLOAD) { - llinfos << "Executing Queued PARCEL_MEDIA_UNLOAD command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_UNLOAD command." << LL_ENDL; LLViewerParcelMedia::stop(); } else if (LLViewerParcelMedia::sMediaCommandQueue == PARCEL_MEDIA_COMMAND_TIME) { - llinfos << "Executing Queued PARCEL_MEDIA_TIME command." << llendl; + LL_INFOS() << "Executing Queued PARCEL_MEDIA_TIME command." << LL_ENDL; LLViewerParcelMedia::seek(LLViewerParcelMedia::sMediaCommandTime); } LLViewerParcelMedia::sMediaCommandQueue = 0; diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index cebe98b3e3..5795b35433 100755 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -556,20 +556,20 @@ void LLViewerTexture::updateClass(const F32 velocity, const F32 angular_velocity if (sEvaluationTimer.getElapsedTimeF32() > discard_delta_time) { sDesiredDiscardBias += discard_bias_delta; - llinfos << "new bias " << sDesiredDiscardBias + LL_INFOS() << "new bias " << sDesiredDiscardBias << " sBoundTextureMemoryInBytes " << sBoundTextureMemoryInBytes << " sTotalTextureMemoryInBytes " << sTotalTextureMemoryInBytes << " sMaxBoundTextureMemInMegaBytes " << sMaxBoundTextureMemInMegaBytes << " sMaxTotalTextureMemInMegaBytes " << sMaxTotalTextureMemInMegaBytes - << llendl; + << LL_ENDL; sEvaluationTimer.reset(); } } else if(sEvaluationTimer.getElapsedTimeF32() > discard_delta_time && isMemoryForTextureLow()) { sDesiredDiscardBias += discard_bias_delta; - lldebugs << "new bias " << sDesiredDiscardBias - << llendl; + LL_DEBUGS() << "new bias " << sDesiredDiscardBias + << LL_ENDL; sEvaluationTimer.reset(); } @@ -1579,7 +1579,7 @@ F32 LLViewerFetchedTexture::calcDecodePriority() // NaN has some very special comparison characterisctics. Those would make comparing by decode-prio wrong and destroy strict weak ordering of stl containers. if( llisnan(mDecodePriority ) ) { - llwarns << "Detected NaN for decode priority" << llendl; + LL_WARNS() << "Detected NaN for decode priority" << LL_ENDL; mDecodePriority = 0; // What to put here? Something low? high? zero? } // @@ -1726,7 +1726,7 @@ F32 LLViewerFetchedTexture::calcDecodePriority() // NaN has some very special comparison characterisctics. Those would make comparing by decode-prio wrong and destroy strict weak ordering of stl containers. if( llisnan(priority) ) { - llwarns << "Detected NaN for decode priority" << llendl; + LL_WARNS() << "Detected NaN for decode priority" << LL_ENDL; priority = 0; // What to put here? Something low? high? zero? } // @@ -1753,7 +1753,7 @@ void LLViewerFetchedTexture::setDecodePriority(F32 priority) // NaN has some very special comparison characterisctics. Those would make comparing by decode-prio wrong and destroy strict weak ordering of stl containers. if( llisnan(priority) ) { - llwarns << "Detected NaN for decode priority" << llendl; + LL_WARNS() << "Detected NaN for decode priority" << LL_ENDL; priority = 0; // What to put here? Something low? high? zero? } // @@ -1952,9 +1952,9 @@ bool LLViewerFetchedTexture::updateFetch() if(mFullWidth > MAX_IMAGE_SIZE || mFullHeight > MAX_IMAGE_SIZE) { //discard all oversized textures. - llinfos << "Discarding oversized texture, width= " + LL_INFOS() << "Discarding oversized texture, width= " << mFullWidth << ", height= " - << mFullHeight << llendl; + << mFullHeight << LL_ENDL; destroyRawImage(); LL_WARNS() << "oversize, setting as missing" << LL_ENDL; setIsMissingAsset(); diff --git a/indra/newview/llviewertexturelist.cpp b/indra/newview/llviewertexturelist.cpp index e233a3791d..92583f4303 100755 --- a/indra/newview/llviewertexturelist.cpp +++ b/indra/newview/llviewertexturelist.cpp @@ -1386,7 +1386,7 @@ void LLViewerTextureList::updateMaxResidentTexMem(S32Megabytes mem) S32Megabytes vb_mem = mem; // Proper texture memory calculation - S32 total_mem = getMaxVideoRamSetting(true, mem_multiplier, false); + S32Megabytes total_mem = getMaxVideoRamSetting(true, mem_multiplier, false); if ((vb_mem / 3) > VIDEO_CARD_FRAMEBUFFER_MEM) { diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 8fbd4eac03..0065e0a7bc 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -8831,7 +8831,7 @@ BOOL LLVOAvatar::isTextureDefined(LLAvatarAppearanceDefines::ETextureIndex te, U if( !pImage ) { - llwarns << "getImage( " << (S32)te << ", " << index << " ) returned invalid ptr" << llendl; + LL_WARNS() << "getImage( " << (S32)te << ", " << index << " ) returned invalid ptr" << LL_ENDL; return FALSE; } // diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 32c17e8408..1c595ee835 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -3299,7 +3299,7 @@ bool LLVOAvatarSelf::sendAppearanceMessage(LLMessageSystem *mesgsys) const // hack -- Zwagoth - llinfos << "Setting clientTag" << llendl; + LL_INFOS() << "Setting clientTag" << LL_ENDL; LLTextureEntry* entry = getTE(0); //You edit this to change the tag in your client. Yes. const char* tag_client = "Firestorm"; @@ -3313,7 +3313,7 @@ bool LLVOAvatarSelf::sendAppearanceMessage(LLMessageSystem *mesgsys) const // Need to reset these if you turn off the tag system without relogging, they persist otherwise. // - //llinfos << "Clearing clientTag" << llendl; + //LL_INFOS() << "Clearing clientTag" << LL_ENDL; //LLTextureEntry* entry = getTE(0); //if(entry->getGlow()>0.f) //{ diff --git a/indra/newview/llvograss.cpp b/indra/newview/llvograss.cpp index d0db26ed0a..57d939170a 100755 --- a/indra/newview/llvograss.cpp +++ b/indra/newview/llvograss.cpp @@ -640,7 +640,7 @@ void LLGrassPartition::addGeometryCount(LLSpatialGroup* group, U32& vertex_count if( !obj ) { - llwarns << "Object is 0 (not an alpha maybe)" << llendl; + LL_WARNS() << "Object is 0 (not an alpha maybe)" << LL_ENDL; continue; } @@ -742,9 +742,9 @@ void LLGrassPartition::getGeometry(LLSpatialGroup* group) object->getGeometry(facep->getTEOffset(), verticesp, normalsp, texcoordsp, colorsp, emissivep, indicesp); else { - llwarns << "Object is 0 (not an alpha maybe)" << llendl; + LL_WARNS() << "Object is 0 (not an alpha maybe)" << LL_ENDL; if( facep->getViewerObject() ) - llwarns << typeid( *facep->getViewerObject() ).name() << llendl; + LL_WARNS() << typeid( *facep->getViewerObject() ).name() << LL_ENDL; } // diff --git a/indra/newview/llwlparammanager.cpp b/indra/newview/llwlparammanager.cpp index 9802fbff1e..a9a64933b1 100755 --- a/indra/newview/llwlparammanager.cpp +++ b/indra/newview/llwlparammanager.cpp @@ -495,7 +495,7 @@ bool LLWLParamManager::applySkyParams(const LLSD& params, bool interpolate /*= f { if (params.size() == 0) { - llwarns << "Undefined sky params" << llendl; + LL_WARNS() << "Undefined sky params" << LL_ENDL; return false; } diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 4fdbd82762..ac9d66041b 100755 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -238,11 +238,11 @@ void LLWorld::refreshLimits() SYSTEM_FROM = "Second Life"; // Aurora Sim } - LL_DEBUGS("OS_SETTINGS") << "RegionMaxHeight " << mRegionMaxHeight << llendl; - LL_DEBUGS("OS_SETTINGS") << "RegionMinPrimScale " << mRegionMinPrimScale << llendl; - LL_DEBUGS("OS_SETTINGS") << "RegionMaxPrimScale " << mRegionMaxPrimScale << llendl; - LL_DEBUGS("OS_SETTINGS") << "RegionMaxHollowSize " << mRegionMaxHollowSize << llendl; - LL_DEBUGS("OS_SETTINGS") << "RegionMinHoleSize " << mRegionMinHoleSize << llendl; + LL_DEBUGS("OS_SETTINGS") << "RegionMaxHeight " << mRegionMaxHeight << LL_ENDL; + LL_DEBUGS("OS_SETTINGS") << "RegionMinPrimScale " << mRegionMinPrimScale << LL_ENDL; + LL_DEBUGS("OS_SETTINGS") << "RegionMaxPrimScale " << mRegionMaxPrimScale << LL_ENDL; + LL_DEBUGS("OS_SETTINGS") << "RegionMaxHollowSize " << mRegionMaxHollowSize << LL_ENDL; + LL_DEBUGS("OS_SETTINGS") << "RegionMinHoleSize " << mRegionMinHoleSize << LL_ENDL; } // Aurora Sim void LLWorld::setRegionMaxHeight(F32 val) diff --git a/indra/newview/llworldmapmessage.cpp b/indra/newview/llworldmapmessage.cpp index b53e5a8a5d..8d07330cb1 100755 --- a/indra/newview/llworldmapmessage.cpp +++ b/indra/newview/llworldmapmessage.cpp @@ -218,7 +218,7 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**) // which made debug builds impossible to use on OpenSim if(name.empty()) { - llwarns << "MapBlockReply returned empty region name, not inserting in the world map" << llendl; + LL_WARNS() << "MapBlockReply returned empty region name, not inserting in the world map" << LL_ENDL; } // // Insert that region in the world map, if failure, flag it as a "null_sim" diff --git a/indra/newview/particleeditor.cpp b/indra/newview/particleeditor.cpp index 2565209e30..31ab7678d9 100644 --- a/indra/newview/particleeditor.cpp +++ b/indra/newview/particleeditor.cpp @@ -94,7 +94,7 @@ ParticleEditor::ParticleEditor(const LLSD& key) ParticleEditor::~ParticleEditor() { - lldebugs << "destroying particle editor " << mObject->getID() << llendl; + LL_DEBUGS() << "destroying particle editor " << mObject->getID() << LL_ENDL; clearParticles(); } @@ -230,7 +230,7 @@ void ParticleEditor::clearParticles() if(!mObject) return; - lldebugs << "clearing particles from " << mObject->getID() << llendl; + LL_DEBUGS() << "clearing particles from " << mObject->getID() << LL_ENDL; LLViewerPartSim::getInstance()->clearParticlesByOwnerID(mObject->getID()); } @@ -255,7 +255,7 @@ void ParticleEditor::setObject(LLViewerObject* objectp) { mObject=objectp; - lldebugs << "adding particles to " << mObject->getID() << llendl; + LL_DEBUGS() << "adding particles to " << mObject->getID() << LL_ENDL; updateParticles(); } @@ -515,7 +515,7 @@ default\n\ flagsString+=delimiter+"PSYS_PART_RIBBON_MASK"; LLStringUtil::replaceString(script,"[FLAGS]",flagsString); - lldebugs << "\n" << script << llendl; + LL_DEBUGS() << "\n" << script << LL_ENDL; return script; } @@ -646,7 +646,7 @@ void ParticleEditor::scriptInjectReturned(const LLSD& content) LLViewerObject* object=gObjectList.findObject(mObject->getID()); if(!object) { - lldebugs << "object went away!" << llendl; + LL_DEBUGS() << "object went away!" << LL_ENDL; mMainPanel->setEnabled(TRUE); return; } diff --git a/indra/newview/piemenu.cpp b/indra/newview/piemenu.cpp index b2bc74ff2b..4b7b19e497 100644 --- a/indra/newview/piemenu.cpp +++ b/indra/newview/piemenu.cpp @@ -59,14 +59,14 @@ const S32 PIE_Y[] = { 0,44,73, 44, 0,-44,-73,-44}; PieMenu::PieMenu(const LLContextMenu::Params& p) : LLContextMenu(p) { - lldebugs << "PieMenu::PieMenu()" << llendl; + LL_DEBUGS() << "PieMenu::PieMenu()" << LL_ENDL; // radius, so we need this *2 reshape(PIE_OUTER_SIZE*2,PIE_OUTER_SIZE*2,FALSE); // set up the font for the menu mFont=LLFontGL::getFont(LLFontDescriptor("SansSerif","Pie",LLFontGL::NORMAL)); if(!mFont) { - llwarns << "Could not find font size for Pie menu, falling back to Small font." << llendl; + LL_WARNS() << "Could not find font size for Pie menu, falling back to Small font." << LL_ENDL; mFont=LLFontGL::getFont(LLFontDescriptor("SansSerif","Small",LLFontGL::NORMAL)); } // set slices pointer to our own slices @@ -122,7 +122,7 @@ void PieMenu::show(S32 x, S32 y, LLView* spawning_view) // play a sound make_ui_sound("UISndPieMenuAppear"); - lldebugs << "PieMenu::show(): " << x << " " << y << llendl; + LL_DEBUGS() << "PieMenu::show(): " << x << " " << y << LL_ENDL; // make sure the menu is always the correct size reshape(PIE_OUTER_SIZE*2,PIE_OUTER_SIZE*2,FALSE); @@ -186,7 +186,7 @@ void PieMenu::hide() // make a sound when hiding make_ui_sound("UISndPieMenuHide"); - lldebugs << "Clearing selections" << llendl; + LL_DEBUGS() << "Clearing selections" << LL_ENDL; mSlices=&mMySlices; #if PIE_POPUP_EFFECT @@ -345,7 +345,7 @@ void PieMenu::draw( void ) currentSlice->setEnabled(slice_visible); if (!slice_visible) { - // lldebugs << label << " is not visible" << llendl; + // LL_DEBUGS() << label << " is not visible" << LL_ENDL; label = ""; } @@ -387,7 +387,7 @@ void PieMenu::draw( void ) currentSlice->updateEnabled(); if(!currentSlice->getEnabled()) { - lldebugs << label << " is disabled" << llendl; + LL_DEBUGS() << label << " is disabled" << LL_ENDL; // fade the item color alpha to mark the item as disabled itemColor%=(F32)0.3f; } @@ -450,11 +450,11 @@ void PieMenu::draw( void ) BOOL PieMenu::appendContextSubMenu(PieMenu* menu) { - lldebugs << "PieMenu::appendContextSubMenu()" << llendl; + LL_DEBUGS() << "PieMenu::appendContextSubMenu()" << LL_ENDL; if(!menu) return FALSE; - lldebugs << "PieMenu::appendContextSubMenu() appending " << menu->getLabel() << " to " << getLabel() << llendl; + LL_DEBUGS() << "PieMenu::appendContextSubMenu() appending " << menu->getLabel() << " to " << getLabel() << LL_ENDL; // add the submenu to the list of items mSlices->push_back(menu); diff --git a/indra/newview/pieseparator.cpp b/indra/newview/pieseparator.cpp index 8644ac9fbe..a1621417e7 100644 --- a/indra/newview/pieseparator.cpp +++ b/indra/newview/pieseparator.cpp @@ -34,7 +34,7 @@ PieSeparator::PieSeparator(const PieSeparator::Params& p) : LLUICtrl(p) { - lldebugs << "PieSeparator::PieSeparator()" << llendl; + LL_DEBUGS() << "PieSeparator::PieSeparator()" << LL_ENDL; } // pick up parameters from the XUI definition diff --git a/indra/newview/pieslice.cpp b/indra/newview/pieslice.cpp index 9f5bc056ba..5a1a336a02 100644 --- a/indra/newview/pieslice.cpp +++ b/indra/newview/pieslice.cpp @@ -39,7 +39,7 @@ PieSlice::PieSlice(const PieSlice::Params& p) : mDoUpdateEnabled(TRUE) { - lldebugs << "PieSlice::PieSlice(): " << mLabel << " " << mAutohide << " " << mCheckEnableOnce << llendl; + LL_DEBUGS() << "PieSlice::PieSlice(): " << mLabel << " " << mAutohide << " " << mCheckEnableOnce << LL_ENDL; } // pick up parameters from the XUI definition diff --git a/indra/newview/qtoolalign.cpp b/indra/newview/qtoolalign.cpp index 01c6f23ca8..b49c05524f 100644 --- a/indra/newview/qtoolalign.cpp +++ b/indra/newview/qtoolalign.cpp @@ -110,7 +110,7 @@ void QToolAlign::handleSelect() { // no parts, please - llwarns << "in select" << llendl; + LL_WARNS() << "in select" << LL_ENDL; LLSelectMgr::getInstance()->promoteSelectionToRoot(); } @@ -588,7 +588,7 @@ void AlignThread::run() if((i % 50 == 0) && (j % 100 == 0)) { - llwarns << "i=" << i << " j=" << j << llendl; + LL_WARNS() << "i=" << i << " j=" << j << LL_ENDL; } if (!QToolAlign::getInstance()->mForce) // well, don't check if in force mode @@ -602,8 +602,8 @@ void AlignThread::run() if (overlaps_this) { - //llwarns << "overlap" << new_bbox.getCenterAgent() << other_bbox.getCenterAgent() << llendl; - //llwarns << "extent" << new_bbox.getExtentLocal() << other_bbox.getExtentLocal() << llendl; + //LL_WARNS() << "overlap" << new_bbox.getCenterAgent() << other_bbox.getCenterAgent() << LL_ENDL; + //LL_WARNS() << "extent" << new_bbox.getExtentLocal() << other_bbox.getExtentLocal() << LL_ENDL; } overlap = (overlap || overlaps_this); diff --git a/indra/newview/quickprefs.cpp b/indra/newview/quickprefs.cpp index 92d5d03df3..44528e7388 100644 --- a/indra/newview/quickprefs.cpp +++ b/indra/newview/quickprefs.cpp @@ -127,7 +127,7 @@ void FloaterQuickPrefs::onOpen(const LLSD& key) LLUICtrl* current_widget=entry.widget; if(!current_widget) { - llwarns << "missing widget for control " << it->first << llendl; + LL_WARNS() << "missing widget for control " << it->first << LL_ENDL; continue; } @@ -441,11 +441,11 @@ void FloaterQuickPrefs::loadSavedSettingsFromFile(const std::string& settings_pa if(!LLXMLNode::parseFile(settings_path,root,NULL)) { - llwarns << "Unable to load quick preferences from file: " << settings_path << llendl; + LL_WARNS() << "Unable to load quick preferences from file: " << settings_path << LL_ENDL; } else if(!root->hasName("quickprefs")) { - llwarns << settings_path << " is not a valid quick preferences definition file" << llendl; + LL_WARNS() << settings_path << " is not a valid quick preferences definition file" << LL_ENDL; } else { @@ -455,7 +455,7 @@ void FloaterQuickPrefs::loadSavedSettingsFromFile(const std::string& settings_pa if(!xml.validateBlock()) { - llwarns << "Unable to validate quick preferences from file: " << settings_path << llendl; + LL_WARNS() << "Unable to validate quick preferences from file: " << settings_path << LL_ENDL; } else { @@ -1107,7 +1107,7 @@ void FloaterQuickPrefs::updateControl(const std::string& controlName,ControlEntr } else { - llwarns << "Could not find control variable " << controlName << llendl; + LL_WARNS() << "Could not find control variable " << controlName << LL_ENDL; } } @@ -1117,7 +1117,7 @@ LLUICtrl* FloaterQuickPrefs::addControl(const std::string& controlName,const std LLLayoutPanel* panel=LLUICtrlFactory::createFromFile("panel_quickprefs_item.xml",NULL,LLLayoutStack::child_registry_t::instance()); if(!panel) { - llwarns << "could not add panel" << llendl; + LL_WARNS() << "could not add panel" << LL_ENDL; return NULL; } @@ -1181,7 +1181,7 @@ void FloaterQuickPrefs::removeControl(const std::string& controlName,BOOL remove const control_list_t::iterator it=mControlsList.find(controlName); if(it==mControlsList.end()) { - llwarns << "Couldn't find control entry " << controlName << llendl; + LL_WARNS() << "Couldn't find control entry " << controlName << LL_ENDL; return; } @@ -1861,7 +1861,7 @@ void FloaterQuickPrefs::callbackRestoreDefaults(const LLSD& notification, const } else { - llinfos << "User cancelled the reset." << llendl; + LL_INFOS() << "User cancelled the reset." << LL_ENDL; } } diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp index 2ae0466927..f63af53763 100644 --- a/indra/newview/rlvhandler.cpp +++ b/indra/newview/rlvhandler.cpp @@ -1748,9 +1748,9 @@ ERlvCmdRet RlvHandler::onForceGroup(const RlvCommand& rlvCmd) const } else { - for (S32 idxGroup = 0, cntGroup = gAgent.mGroups.count(); (idxGroup < cntGroup) && (idGroup.isNull()); idxGroup++) - if (boost::iequals(gAgent.mGroups.get(idxGroup).mName, rlvCmd.getOption())) - idGroup = gAgent.mGroups.get(idxGroup).mID; + for (S32 idxGroup = 0, cntGroup = gAgent.mGroups.size(); (idxGroup < cntGroup) && (idGroup.isNull()); idxGroup++) + if (boost::iequals(gAgent.mGroups.at(idxGroup).mName, rlvCmd.getOption())) + idGroup = gAgent.mGroups.at(idxGroup).mID; fValid = (idGroup.notNull()) || ("none" == rlvCmd.getOption()); } @@ -1829,8 +1829,8 @@ void RlvHandler::onForceWearCallback(const uuid_vec_t& idItems, ERlvBehaviour eB LLInventoryModel::cat_array_t folders; if (RlvInventory::instance().getPath(idItems, folders)) { - for (S32 idxFolder = 0, cntFolder = folders.count(); idxFolder < cntFolder; idxFolder++) - onForceWear(folders.get(idxFolder), eBhvr); + for (S32 idxFolder = 0, cntFolder = folders.size(); idxFolder < cntFolder; idxFolder++) + onForceWear(folders.at(idxFolder), eBhvr); // If we're not executing a command then we're a delayed callback and need to manually call done() if ( (!getCurrentCommand()) && (RlvForceWear::instanceExists()) ) @@ -1983,9 +1983,9 @@ ERlvCmdRet RlvHandler::onFindFolder(const RlvCommand& rlvCmd, std::string& strRe // We need to return an "in depth" result so whoever has the most '/' is our lucky winner // (maxSlashes needs to be initialized to -1 since children of the #RLV folder won't have '/' in their shared path) int maxSlashes = -1, curSlashes; std::string strFolderName; - for (S32 idxFolder = 0, cntFolder = folders.count(); idxFolder < cntFolder; idxFolder++) + for (S32 idxFolder = 0, cntFolder = folders.size(); idxFolder < cntFolder; idxFolder++) { - strFolderName = RlvInventory::instance().getSharedPath(folders.get(idxFolder)); + strFolderName = RlvInventory::instance().getSharedPath(folders.at(idxFolder)); curSlashes = std::count(strFolderName.begin(), strFolderName.end(), '/'); if (curSlashes > maxSlashes) @@ -1997,11 +1997,11 @@ ERlvCmdRet RlvHandler::onFindFolder(const RlvCommand& rlvCmd, std::string& strRe } else if (RLV_BHVR_FINDFOLDERS == rlvCmd.getBehaviourType()) { - for (S32 idxFolder = 0, cntFolder = folders.count(); idxFolder < cntFolder; idxFolder++) + for (S32 idxFolder = 0, cntFolder = folders.size(); idxFolder < cntFolder; idxFolder++) { if (!strReply.empty()) strReply.push_back(','); - strReply += RlvInventory::instance().getSharedPath(folders.get(idxFolder)); + strReply += RlvInventory::instance().getSharedPath(folders.at(idxFolder)); } } } @@ -2111,15 +2111,15 @@ ERlvCmdRet RlvHandler::onGetInv(const RlvCommand& rlvCmd, std::string& strReply) if (!pFolders) return RLV_RET_FAILED; - for (S32 idxFolder = 0, cntFolder = pFolders->count(); idxFolder < cntFolder; idxFolder++) + for (S32 idxFolder = 0, cntFolder = pFolders->size(); idxFolder < cntFolder; idxFolder++) { // Return all folders that: // - aren't hidden // - aren't a folded folder (only really matters when "Enable Legacy Naming" is enabled - see related blog post) // (we can skip checking for . folders since the ones we'll want to hide start with '.' anyway) - const std::string& strFolder = pFolders->get(idxFolder)->getName(); + const std::string& strFolder = pFolders->at(idxFolder)->getName(); if ( (!strFolder.empty()) && (RLV_FOLDER_PREFIX_HIDDEN != strFolder[0]) && - (!RlvInventory::isFoldedFolder(pFolders->get(idxFolder).get(), false)) ) + (!RlvInventory::isFoldedFolder(pFolders->at(idxFolder).get(), false)) ) { if (!strReply.empty()) strReply.push_back(','); @@ -2152,14 +2152,14 @@ ERlvCmdRet RlvHandler::onGetInvWorn(const RlvCommand& rlvCmd, std::string& strRe // Add all the folders to a lookup map std::map mapFolders; mapFolders.insert(std::pair(pFolder->getUUID(), wi)); - for (S32 idxFolder = 0, cntFolder = folders.count(); idxFolder < cntFolder; idxFolder++) - mapFolders.insert(std::pair(folders.get(idxFolder)->getUUID(), wi)); + for (S32 idxFolder = 0, cntFolder = folders.size(); idxFolder < cntFolder; idxFolder++) + mapFolders.insert(std::pair(folders.at(idxFolder)->getUUID(), wi)); // Iterate over all the found items LLViewerInventoryItem* pItem; std::map::iterator itFolder; - for (S32 idxItem = 0, cntItem = items.count(); idxItem < cntItem; idxItem++) + for (S32 idxItem = 0, cntItem = items.size(); idxItem < cntItem; idxItem++) { - pItem = items.get(idxItem); + pItem = items.at(idxItem); if (!RlvForceWear::isWearableItem(pItem)) continue; @@ -2295,15 +2295,15 @@ ERlvCmdRet RlvHandler::onGetPath(const RlvCommand& rlvCmd, std::string& strReply { if (RLV_BHVR_GETPATH == rlvCmd.getBehaviourType()) { - strReply = RlvInventory::instance().getSharedPath(folders.get(0)); + strReply = RlvInventory::instance().getSharedPath(folders.at(0)); } else if (RLV_BHVR_GETPATHNEW == rlvCmd.getBehaviourType()) { - for (S32 idxFolder = 0, cntFolder = folders.count(); idxFolder < cntFolder; idxFolder++) + for (S32 idxFolder = 0, cntFolder = folders.size(); idxFolder < cntFolder; idxFolder++) { if (!strReply.empty()) strReply.push_back(','); - strReply += RlvInventory::instance().getSharedPath(folders.get(idxFolder)); + strReply += RlvInventory::instance().getSharedPath(folders.at(idxFolder)); } } } diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp index ae645294a3..345e333199 100644 --- a/indra/newview/rlvhelper.cpp +++ b/indra/newview/rlvhelper.cpp @@ -488,9 +488,9 @@ void RlvForceWear::forceFolder(const LLViewerInventoryCategory* pFolder, EWearAc bool fSeenWType[LLWearableType::WT_COUNT] = { false }; EWearAction eCurAction = eAction; - for (S32 idxItem = 0, cntItem = items.count(); idxItem < cntItem; idxItem++) + for (S32 idxItem = 0, cntItem = items.size(); idxItem < cntItem; idxItem++) { - LLViewerInventoryItem* pRlvItem = items.get(idxItem); + LLViewerInventoryItem* pRlvItem = items.at(idxItem); LLViewerInventoryItem* pItem = (LLAssetType::AT_LINK == pRlvItem->getActualType()) ? pRlvItem->getLinkedItem() : pRlvItem; // If it's wearable it should be worn on detach @@ -925,8 +925,8 @@ void RlvForceWear::done() if (m_remGestures.size()) { // NOTE: LLGestureMgr::deactivateGesture() will call LLAppearanceMgr::removeCOFItemLinks() for us - for (S32 idxItem = 0, cntItem = m_remGestures.count(); idxItem < cntItem; idxItem++) - LLGestureMgr::instance().deactivateGesture(m_remGestures.get(idxItem)->getUUID()); + for (S32 idxItem = 0, cntItem = m_remGestures.size(); idxItem < cntItem; idxItem++) + LLGestureMgr::instance().deactivateGesture(m_remGestures.at(idxItem)->getUUID()); m_remGestures.clear(); } @@ -954,9 +954,9 @@ void RlvForceWear::done() for (addwearables_map_t::const_iterator itAddWearables = m_addWearables.begin(); itAddWearables != m_addWearables.end(); ++itAddWearables) { const LLInventoryModel::item_array_t& wearItems = itAddWearables->second; - for (S32 idxItem = 0, cntItem = wearItems.count(); idxItem < cntItem; idxItem++) + for (S32 idxItem = 0, cntItem = wearItems.size(); idxItem < cntItem; idxItem++) { - LLViewerInventoryItem* pItem = wearItems.get(idxItem); + LLViewerInventoryItem* pItem = wearItems.at(idxItem); if (!pAppearanceMgr->isLinkInCOF(pItem->getUUID())) // It's important to examine COF here and *not* gAgentWearables { if (LLAssetType::AT_BODYPART == pItem->getType()) @@ -973,9 +973,9 @@ void RlvForceWear::done() itAddAttachments != m_addAttachments.end(); ++itAddAttachments) { const LLInventoryModel::item_array_t& wearItems = itAddAttachments->second; - for (S32 idxItem = 0, cntItem = wearItems.count(); idxItem < cntItem; idxItem++) + for (S32 idxItem = 0, cntItem = wearItems.size(); idxItem < cntItem; idxItem++) { - const LLUUID& idItem = wearItems.get(idxItem)->getLinkedUUID(); + const LLUUID& idItem = wearItems.at(idxItem)->getLinkedUUID(); if (gAgentAvatarp->attachmentWasRequested(idItem)) continue; gAgentAvatarp->addAttachmentRequest(idItem); diff --git a/indra/newview/rlvinventory.cpp b/indra/newview/rlvinventory.cpp index 03e98be84d..821e02c455 100644 --- a/indra/newview/rlvinventory.cpp +++ b/indra/newview/rlvinventory.cpp @@ -108,8 +108,8 @@ void RlvInventory::fetchSharedInventory() // Add them to the "to fetch" list uuid_vec_t idFolders; idFolders.push_back(pRlvRoot->getUUID()); - for (S32 idxFolder = 0, cntFolder = folders.count(); idxFolder < cntFolder; idxFolder++) - idFolders.push_back(folders.get(idxFolder)->getUUID()); + for (S32 idxFolder = 0, cntFolder = folders.size(); idxFolder < cntFolder; idxFolder++) + idFolders.push_back(folders.at(idxFolder)->getUUID()); // Now fetch them all in one go RlvSharedInventoryFetcher* pFetcher = new RlvSharedInventoryFetcher(idFolders); @@ -138,9 +138,9 @@ void RlvInventory::fetchSharedLinks() // Add them to the "to fetch" list based on link type uuid_vec_t idFolders, idItems; - for (S32 idxItem = 0, cntItem = items.count(); idxItem < cntItem; idxItem++) + for (S32 idxItem = 0, cntItem = items.size(); idxItem < cntItem; idxItem++) { - const LLViewerInventoryItem* pItem = items.get(idxItem); + const LLViewerInventoryItem* pItem = items.at(idxItem); switch (pItem->getActualType()) { case LLAssetType::AT_LINK: @@ -215,7 +215,7 @@ bool RlvInventory::findSharedFolders(const std::string& strCriteria, LLInventory RlvCriteriaCategoryCollector f(strCriteria); gInventory.collectDescendentsIf(pRlvRoot->getUUID(), folders, items, FALSE, f); - return (folders.count() != 0); + return (folders.size() != 0); } // Checked: 2010-08-30 (RLVa-1.2.1c) | Modified: RLVa-1.2.1c @@ -240,7 +240,7 @@ bool RlvInventory::getPath(const uuid_vec_t& idItems, LLInventoryModel::cat_arra } } - return (folders.count() != 0); + return (folders.size() != 0); } // Checked: 2011-10-06 (RLVa-1.4.2a) | Modified: RLVa-1.4.2a @@ -254,9 +254,9 @@ const LLUUID& RlvInventory::getSharedRootID() const { // NOTE: we might have multiple #RLV folders (pick the first one with sub-folders; otherwise the last one with no sub-folders) const LLViewerInventoryCategory* pFolder; - for (S32 idxFolder = 0, cntFolder = pFolders->count(); idxFolder < cntFolder; idxFolder++) + for (S32 idxFolder = 0, cntFolder = pFolders->size(); idxFolder < cntFolder; idxFolder++) { - if ( ((pFolder = pFolders->get(idxFolder)) != NULL) && (cstrSharedRoot == pFolder->getName()) ) + if ( ((pFolder = pFolders->at(idxFolder)) != NULL) && (cstrSharedRoot == pFolder->getName()) ) { m_idRlvRoot = pFolder->getUUID(); if (getDirectDescendentsFolderCount(pFolder) > 0) @@ -364,8 +364,8 @@ S32 RlvInventory::getDirectDescendentsItemCount(const LLInventoryCategory* pFold if (pItems) { - for (S32 idxItem = 0, cntItem = pItems->count(); idxItem < cntItem; idxItem++) - if (pItems->get(idxItem)->getType() == filterType) + for (S32 idxItem = 0, cntItem = pItems->size(); idxItem < cntItem; idxItem++) + if (pItems->at(idxItem)->getType() == filterType) cntType++; } } @@ -440,9 +440,9 @@ void RlvRenameOnWearObserver::doneIdle() continue; } - for (S32 idxItem = 0, cntItem = items.count(); idxItem < cntItem; idxItem++) + for (S32 idxItem = 0, cntItem = items.size(); idxItem < cntItem; idxItem++) { - LLViewerInventoryItem* pItem = items.get(idxItem); + LLViewerInventoryItem* pItem = items.at(idxItem); if (!pItem) continue; diff --git a/indra/newview/rlvlocks.cpp b/indra/newview/rlvlocks.cpp index 6377d84de6..69258bd966 100644 --- a/indra/newview/rlvlocks.cpp +++ b/indra/newview/rlvlocks.cpp @@ -1005,7 +1005,7 @@ void RlvFolderLocks::addFolderLock(const folderlock_source_t& lockSource, ELockP // Checked: 2011-03-28 (RLVa-1.3.0g) | Modified: RLVa-1.3.0g bool RlvFolderLocks::getLockedFolders(const folderlock_source_t& lockSource, LLInventoryModel::cat_array_t& lockFolders) const { - S32 cntFolders = lockFolders.count(); + S32 cntFolders = lockFolders.size(); switch (lockSource.first) { case ST_ATTACHMENT: @@ -1067,13 +1067,13 @@ bool RlvFolderLocks::getLockedFolders(const folderlock_source_t& lockSource, LLI default: return false; }; - return cntFolders != lockFolders.count(); + return cntFolders != lockFolders.size(); } // Checked: 2011-11-26 (RLVa-1.5.4a) | Modified: RLVa-1.5.4a bool RlvFolderLocks::getLockedItems(const LLUUID& idFolder, LLInventoryModel::item_array_t& lockItems) const { - S32 cntItems = lockItems.count(); + S32 cntItems = lockItems.size(); LLInventoryModel::cat_array_t folders; LLInventoryModel::item_array_t items; LLFindWearablesEx f(true, true); // Collect all worn items @@ -1083,9 +1083,9 @@ bool RlvFolderLocks::getLockedItems(const LLUUID& idFolder, LLInventoryModel::it std::map folderLookups; std::map::const_iterator itLookup; bool fItemLocked = false; - for (S32 idxItem = 0, cntItem = items.count(); idxItem < cntItem; idxItem++) + for (S32 idxItem = 0, cntItem = items.size(); idxItem < cntItem; idxItem++) { - LLViewerInventoryItem* pItem = items.get(idxItem); + LLViewerInventoryItem* pItem = items.at(idxItem); if (LLAssetType::AT_LINK == pItem->getActualType()) pItem = pItem->getLinkedItem(); if (!pItem) @@ -1130,7 +1130,7 @@ bool RlvFolderLocks::getLockedItems(const LLUUID& idFolder, LLInventoryModel::it lockItems.push_back(pItem); } - return cntItems != lockItems.count(); + return cntItems != lockItems.size(); } // Checked: 2011-03-29 (RLVa-1.3.0g) | Added: RLVa-1.3.0g @@ -1247,9 +1247,9 @@ void RlvFolderLocks::refreshLockedLookups() const LLInventoryModel::cat_array_t lockedFolders; const LLUUID& idFolderRoot = gInventory.getRootFolderID(); if (getLockedFolders(pLockDescr->lockSource, lockedFolders)) { - for (S32 idxFolder = 0, cntFolder = lockedFolders.count(); idxFolder < cntFolder; idxFolder++) + for (S32 idxFolder = 0, cntFolder = lockedFolders.size(); idxFolder < cntFolder; idxFolder++) { - const LLViewerInventoryCategory* pFolder = lockedFolders.get(idxFolder); + const LLViewerInventoryCategory* pFolder = lockedFolders.at(idxFolder); if (idFolderRoot != pFolder->getUUID()) m_LockedFolderMap.insert(std::pair(pFolder->getUUID(), pLockDescr)); else @@ -1268,9 +1268,9 @@ void RlvFolderLocks::refreshLockedLookups() const LLInventoryModel::item_array_t lockedItems; if (getLockedItems(LLAppearanceMgr::instance().getCOF(), lockedItems)) { - for (S32 idxItem = 0, cntItem = lockedItems.count(); idxItem < cntItem; idxItem++) + for (S32 idxItem = 0, cntItem = lockedItems.size(); idxItem < cntItem; idxItem++) { - const LLViewerInventoryItem* pItem = lockedItems.get(idxItem); + const LLViewerInventoryItem* pItem = lockedItems.at(idxItem); switch (pItem->getType()) { case LLAssetType::AT_BODYPART: diff --git a/indra/newview/rlvlocks.h b/indra/newview/rlvlocks.h index a4cc480178..8b80b3085b 100644 --- a/indra/newview/rlvlocks.h +++ b/indra/newview/rlvlocks.h @@ -17,7 +17,7 @@ #ifndef RLV_LOCKS_H #define RLV_LOCKS_H -#include "llagentconstants.h" +//#include "llagentconstants.h" #include "llagentwearables.h" #include "lleventtimer.h" #include "llvoavatarself.h" diff --git a/indra/newview/rlvui.cpp b/indra/newview/rlvui.cpp index 36a2a5d61c..a2ba875b55 100644 --- a/indra/newview/rlvui.cpp +++ b/indra/newview/rlvui.cpp @@ -584,12 +584,12 @@ bool RlvUIEnabler::canViewParcelProperties() const LLUUID& idOwner = pParcel->getOwnerID(); if ( (idOwner != gAgent.getID()) ) { - S32 count = gAgent.mGroups.count(); + S32 count = gAgent.mGroups.size(); for (S32 i = 0; i < count; ++i) { - if (gAgent.mGroups.get(i).mID == idOwner) + if (gAgent.mGroups.at(i).mID == idOwner) { - fShow = ((gAgent.mGroups.get(i).mPowers & GP_LAND_RETURN) > 0); + fShow = ((gAgent.mGroups.at(i).mPowers & GP_LAND_RETURN) > 0); break; } }