summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLogan Dethrow <log@lindenlab.com>2013-04-02 19:51:45 +0000
committerLogan Dethrow <log@lindenlab.com>2013-04-02 19:51:45 +0000
commit557adcabb925acbcc79f39f76f7cb74b6202a8da (patch)
tree36d4a04ef0c1c242171bc2bdf114030fa7930965
parent9927963ac9d7ef19db96e8d5ffa04c04d0e3b803 (diff)
Renamed logCapabilites static function to log_capabilities in llviewerregion.cpp to better match coding standard.
-rw-r--r--indra/newview/llviewerregion.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index f4b6ff318b..f0d81c599c 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -87,7 +87,7 @@ const S32 MAX_CAP_REQUEST_ATTEMPTS = 30;
typedef std::map<std::string, std::string> CapabilityMap;
-static void logCapabilities(const CapabilityMap &capmap);
+static void log_capabilities(const CapabilityMap &capmap);
class LLViewerRegionImpl {
public:
@@ -331,12 +331,12 @@ private:
//LL_WARNS2("AppInit", "Capabilities")
// << "Initial Base capabilities: " << LL_ENDL;
- //logCapabilities(regionp->getRegionImpl()->mCapabilities);
+ //log_capabilities(regionp->getRegionImpl()->mCapabilities);
//LL_WARNS2("AppInit", "Capabilities")
// << "Latest base capabilities: " << LL_ENDL;
- //logCapabilities(regionp->getRegionImpl()->mSecondCapabilitiesTracker);
+ //log_capabilities(regionp->getRegionImpl()->mSecondCapabilitiesTracker);
// *TODO
//add cap debug versus original check?
@@ -1915,7 +1915,7 @@ boost::signals2::connection LLViewerRegion::setCapabilitiesReceivedCallback(cons
void LLViewerRegion::logActiveCapabilities() const
{
- logCapabilities(mImpl->mCapabilities);
+ log_capabilities(mImpl->mCapabilities);
}
LLSpatialPartition* LLViewerRegion::getSpatialPartition(U32 type)
@@ -2001,7 +2001,7 @@ bool LLViewerRegion::dynamicPathfindingEnabled() const
/* Static Functions */
-void logCapabilities(const CapabilityMap &capmap)
+void log_capabilities(const CapabilityMap &capmap)
{
S32 count = 0;
CapabilityMap::const_iterator iter;
@@ -2009,9 +2009,9 @@ void logCapabilities(const CapabilityMap &capmap)
{
if (!iter->second.empty())
{
- llinfos << "logCapabilities: " << iter->first << " URL is " << iter->second << llendl;
+ llinfos << "log_capabilities: " << iter->first << " URL is " << iter->second << llendl;
}
}
- llinfos << "logCapabilities: Dumped " << count << " entries." << llendl;
+ llinfos << "log_capabilities: Dumped " << count << " entries." << llendl;
}