diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp
index 72a77407f282c1ef6953fff2c95e2c8d672353ef..5a88ccf45a2f5d7af9c253ab20b3af77fbc2e024 100644
--- a/indra/newview/llappearancemgr.cpp
+++ b/indra/newview/llappearancemgr.cpp
@@ -2138,7 +2138,7 @@ void LLAppearanceMgr::filterWearableItems(
continue;
// S32 start_index = llmax(0,size-max_per_type);
// [SL:KB] - Patch: Appearance-Misc | Checked: 2010-05-11 (Catznip-2.0)
- S32 start_index = llmax(0, size - ((LLWearableType::getAllowMultiwear((LLWearableType::EType)i)) ? max_per_type : 1));
+ S32 start_index = llmax(0, size - ((LLWearableType::getInstanceFast()->getAllowMultiwear((LLWearableType::EType)i)) ? max_per_type : 1));
// [/SL:KB[
for (S32 j = start_index; j<size; j++)
{
diff --git a/indra/newview/lllogchat.cpp b/indra/newview/lllogchat.cpp
index bdd1c2186d3758303d4a08648ebae11471483b43..b3a2f73325a2e74a8f63b91cdb6e3d8e584aa39b 100644
--- a/indra/newview/lllogchat.cpp
+++ b/indra/newview/lllogchat.cpp
@@ -41,7 +41,6 @@
#include <boost/algorithm/string/trim.hpp>
#include <boost/algorithm/string/replace.hpp>
-#include <boost/regex/v4/match_results.hpp>
#include <boost/date_time/gregorian/gregorian.hpp>
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/date_time/local_time_adjustor.hpp>
diff --git a/indra/newview/llpanelface.cpp b/indra/newview/llpanelface.cpp
index 9c48b1499f96a093291c434bb8a874d2e5eba4b0..ea7750266c238e0ada832325f2c86ad2a669c202 100644
--- a/indra/newview/llpanelface.cpp
+++ b/indra/newview/llpanelface.cpp
@@ -338,7 +338,7 @@ void LLPanelFace::sendBump(U32 bumpiness)
//
LLSelectedTEMaterial::setNormalID(this, current_normal_map);
- LLSelectMgr::getInstanceFast()->selectionSetBumpmap( bump, bumpytexture_ctrl->getImageItemID() );
+ LLSelectMgr::getInstanceFast()->selectionSetBumpmap( bump, mBumpyTextureCtrl->getImageItemID() );
}
void LLPanelFace::sendTexGen()
@@ -363,7 +363,7 @@ void LLPanelFace::sendShiny(U32 shininess)
LLSelectedTEMaterial::setSpecularID(this, specmap);
- LLSelectMgr::getInstanceFast()->selectionSetShiny( shiny, texture_ctrl->getImageItemID() );
+ LLSelectMgr::getInstanceFast()->selectionSetShiny( shiny, mShinyTextureCtrl->getImageItemID() );
updateShinyControls(!specmap.isNull(), true);
diff --git a/indra/newview/llsechandler_basic.cpp b/indra/newview/llsechandler_basic.cpp
index 6f6c057bbc2cbc06ca572e69d8da6eed02a3365e..8f61041592394c9ca83a47c6bb82dc94cf140208 100644
--- a/indra/newview/llsechandler_basic.cpp
+++ b/indra/newview/llsechandler_basic.cpp
@@ -1466,6 +1466,7 @@ void LLSecAPIBasicHandler::_readProtectedData(unsigned char *unique_id, U32 id_l
// everything failed abort
LLTHROW(LLProtectedDataException("Config file cannot be decrypted."));
}
+ }
}
}
diff --git a/indra/newview/rlvfloaters.cpp b/indra/newview/rlvfloaters.cpp
index 98c0d49ef077177f6c15a59e73f21d399453846a..ac7226c0d6d3b7bdb1b8c36f5d4473cd667708e1 100644
--- a/indra/newview/rlvfloaters.cpp
+++ b/indra/newview/rlvfloaters.cpp
@@ -45,7 +45,7 @@ std::string rlvGetItemName(const LLViewerInventoryItem* pItem)
{
if ( (pItem) && ((LLAssetType::AT_BODYPART == pItem->getType()) || (LLAssetType::AT_CLOTHING == pItem->getType())) )
{
- return llformat("%s (%s)", pItem->getName().c_str(), LLWearableType::getTypeName(pItem->getWearableType()).c_str());
+ return llformat("%s (%s)", pItem->getName().c_str(), LLWearableType::getInstanceFast()->getTypeName(pItem->getWearableType()).c_str());
}
else if ( (pItem) && (LLAssetType::AT_OBJECT == pItem->getType()) && (isAgentAvatarValid()) )
{
@@ -192,7 +192,7 @@ std::string rlvFolderLockSourceToTarget(RlvFolderLocks::folderlock_source_t lock
}
case RlvFolderLocks::ST_WEARABLETYPE:
{
- const std::string& strTypeName = LLWearableType::getTypeName(boost::get<LLWearableType::EType>(lockSource.second));
+ const std::string& strTypeName = LLWearableType::getInstanceFast()->getTypeName(boost::get<LLWearableType::EType>(lockSource.second));
return llformat("Wearable type (%s)", strTypeName.c_str());
}
default:
@@ -531,7 +531,7 @@ void RlvFloaterLocks::refreshAll()
for (RlvWearableLocks::rlv_wearabletypelock_map_t::const_iterator itWearableType = wearableTypeAdd.begin();
itWearableType != wearableTypeAdd.end(); ++itWearableType)
{
- sdColumns[2]["value"] = LLWearableType::getTypeLabel(itWearableType->first);
+ sdColumns[2]["value"] = LLWearableType::getInstanceFast()->getTypeLabel(itWearableType->first);
sdColumns[3]["value"] = rlvGetItemNameFromObjID(itWearableType->second);
pLockList->addElement(sdRow, ADD_BOTTOM);
@@ -542,7 +542,7 @@ void RlvFloaterLocks::refreshAll()
for (RlvWearableLocks::rlv_wearabletypelock_map_t::const_iterator itWearableType = wearableTypeRem.begin();
itWearableType != wearableTypeRem.end(); ++itWearableType)
{
- sdColumns[2]["value"] = LLWearableType::getTypeName(itWearableType->first);
+ sdColumns[2]["value"] = LLWearableType::getInstanceFast()->getTypeName(itWearableType->first);
sdColumns[3]["value"] = rlvGetItemNameFromObjID(itWearableType->second);
pLockList->addElement(sdRow, ADD_BOTTOM);
diff --git a/indra/newview/rlvhandler.cpp b/indra/newview/rlvhandler.cpp
index ea3aff58ad9af1d9dd746400f5c4168c1cf6ea19..523555c615af51ddd5fb3715a7e7a716d1a13669 100644
--- a/indra/newview/rlvhandler.cpp
+++ b/indra/newview/rlvhandler.cpp
@@ -3845,7 +3845,7 @@ ERlvCmdRet RlvHandler::onGetOutfit(const RlvCommand& rlvCmd, std::string& strRep
// (Compatibility: RLV-1.16.1 will execute @getoutfit=<channel> if <layer> is invalid while we just return failure)
LLWearableType::EType wtType = LLWearableType::WT_INVALID;
- if ( (rlvCmd.hasOption()) && ((wtType = LLWearableType::typeNameToType(rlvCmd.getOption())) == LLWearableType::WT_INVALID) )
+ if ( (rlvCmd.hasOption()) && ((wtType = LLWearableType::getInstanceFast()->typeNameToType(rlvCmd.getOption())) == LLWearableType::WT_INVALID) )
return RLV_RET_FAILED_OPTION;
const LLWearableType::EType wtRlvTypes[] =
@@ -3865,7 +3865,7 @@ ERlvCmdRet RlvHandler::onGetOutfit(const RlvCommand& rlvCmd, std::string& strRep
// (nor do we hide a layer if the issuing object is the only one that has this layer locked)
bool fWorn = (gAgentWearables.getWearableCount(wtRlvTypes[idxType]) > 0) &&
( (!RlvSettings::getHideLockedLayers()) ||
- (LLAssetType::AT_BODYPART == LLWearableType::getAssetType(wtRlvTypes[idxType])) ||
+ (LLAssetType::AT_BODYPART == LLWearableType::getInstanceFast()->getAssetType(wtRlvTypes[idxType])) ||
(RlvForceWear::isForceRemovable(wtRlvTypes[idxType], true, rlvCmd.getObjectID())) );
strReply.push_back( (fWorn) ? '1' : '0' );
}
@@ -3906,7 +3906,7 @@ ERlvCmdRet RlvHandler::onGetOutfitNames(const RlvCommand& rlvCmd, std::string& s
{
if (!strReply.empty())
strReply.push_back(',');
- strReply.append(LLWearableType::getTypeName(wtType));
+ strReply.append(LLWearableType::getInstanceFast()->getTypeName(wtType));
}
}
return RLV_RET_SUCCESS;
diff --git a/indra/newview/rlvhelper.cpp b/indra/newview/rlvhelper.cpp
index 033fd4b941746a71f028b83d5279bbfc041af18b..2b46978300b04ea0e25fd4d6fe54ca2c7e612b2b 100644
--- a/indra/newview/rlvhelper.cpp
+++ b/indra/newview/rlvhelper.cpp
@@ -850,7 +850,7 @@ bool RlvCommandOptionHelper::parseOption<float>(const std::string& strOption, fl
template<>
bool RlvCommandOptionHelper::parseOption<LLWearableType::EType>(const std::string& strOption, LLWearableType::EType& wtOption)
{
- wtOption = LLWearableType::typeNameToType(strOption);
+ wtOption = LLWearableType::getInstanceFast()->typeNameToType(strOption);
return (LLWearableType::WT_INVALID != wtOption) && (LLWearableType::WT_NONE != wtOption);
}
@@ -1893,13 +1893,13 @@ void RlvBehaviourNotifyHandler::sendNotification(const std::string& strText, con
// Checked: 2011-03-31 (RLVa-1.3.0f) | Added: RLVa-1.3.0f
void RlvBehaviourNotifyHandler::onWear(LLWearableType::EType eType, bool fAllowed)
{
- sendNotification(llformat("worn %s %s", (fAllowed) ? "legally" : "illegally", LLWearableType::getTypeName(eType).c_str()));
+ sendNotification(llformat("worn %s %s", (fAllowed) ? "legally" : "illegally", LLWearableType::getInstanceFast()->getTypeName(eType).c_str()));
}
// Checked: 2011-03-31 (RLVa-1.3.0f) | Added: RLVa-1.3.0f
void RlvBehaviourNotifyHandler::onTakeOff(LLWearableType::EType eType, bool fAllowed)
{
- sendNotification(llformat("unworn %s %s", (fAllowed) ? "legally" : "illegally", LLWearableType::getTypeName(eType).c_str()));
+ sendNotification(llformat("unworn %s %s", (fAllowed) ? "legally" : "illegally", LLWearableType::getInstanceFast()->getTypeName(eType).c_str()));
}
// Checked: 2011-03-31 (RLVa-1.3.0f) | Added: RLVa-1.3.0f