SL-967 simplify viewer log file field syntax
MAINT-8991: only escape log message characters once, add unit test remove extra log line created by LL_ERRS document that tags may not contain spacesmaster
Oz Linden
parent
735b53d724
commit
f1d4e788e7
|
|
@ -40,6 +40,7 @@
|
|||
# include <unistd.h>
|
||||
#endif // !LL_WINDOWS
|
||||
#include <vector>
|
||||
#include "string.h"
|
||||
|
||||
#include "llapp.h"
|
||||
#include "llapr.h"
|
||||
|
|
@ -530,21 +531,16 @@ namespace LLError
|
|||
mTags(new const char* [tag_count]),
|
||||
mTagCount(tag_count)
|
||||
{
|
||||
for (int i = 0; i < tag_count; i++)
|
||||
{
|
||||
mTags[i] = tags[i];
|
||||
}
|
||||
|
||||
switch (mLevel)
|
||||
{
|
||||
case LEVEL_DEBUG: mLevelString = "DEBUG:"; break;
|
||||
case LEVEL_INFO: mLevelString = "INFO:"; break;
|
||||
case LEVEL_WARN: mLevelString = "WARNING:"; break;
|
||||
case LEVEL_ERROR: mLevelString = "ERROR:"; break;
|
||||
default: mLevelString = "XXX:"; break;
|
||||
case LEVEL_DEBUG: mLevelString = "DEBUG"; break;
|
||||
case LEVEL_INFO: mLevelString = "INFO"; break;
|
||||
case LEVEL_WARN: mLevelString = "WARNING"; break;
|
||||
case LEVEL_ERROR: mLevelString = "ERROR"; break;
|
||||
default: mLevelString = "XXX"; break;
|
||||
};
|
||||
|
||||
mLocationString = llformat("%s(%d) :", abbreviateFile(mFile).c_str(), mLine);
|
||||
mLocationString = llformat("%s(%d)", abbreviateFile(mFile).c_str(), mLine);
|
||||
#if LL_WINDOWS
|
||||
// DevStudio: __FUNCTION__ already includes the full class name
|
||||
#else
|
||||
|
|
@ -558,13 +554,23 @@ namespace LLError
|
|||
mFunctionString = className(mClassInfo) + "::";
|
||||
}
|
||||
#endif
|
||||
mFunctionString += std::string(mFunction) + ":";
|
||||
const std::string tag_hash("#");
|
||||
mFunctionString += std::string(mFunction);
|
||||
|
||||
for (int i = 0; i < tag_count; i++)
|
||||
{
|
||||
if (strchr(tags[i], ' '))
|
||||
{
|
||||
LL_ERRS() << "Space is not allowed in a log tag at " << mLocationString << LL_ENDL;
|
||||
}
|
||||
mTags[i] = tags[i];
|
||||
}
|
||||
|
||||
mTagString.append("#");
|
||||
// always construct a tag sequence; will be just a single # if no tag
|
||||
for (size_t i = 0; i < mTagCount; i++)
|
||||
{
|
||||
mTagString.append(tag_hash);
|
||||
mTagString.append(mTags[i]);
|
||||
mTagString.append((i == mTagCount - 1) ? ";" : ",");
|
||||
mTagString.append("#");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -899,7 +905,46 @@ namespace LLError
|
|||
|
||||
namespace
|
||||
{
|
||||
void writeToRecorders(const LLError::CallSite& site, const std::string& message, bool show_location = true, bool show_time = true, bool show_tags = true, bool show_level = true, bool show_function = true)
|
||||
void addEscapedMessage(std::ostream& out, const std::string& message)
|
||||
{
|
||||
size_t written_out = 0;
|
||||
size_t all_content = message.length();
|
||||
size_t escape_char_index; // always relative to start of message
|
||||
// Use find_first_of to find the next character in message that needs escaping
|
||||
for ( escape_char_index = message.find_first_of("\\\n\r");
|
||||
escape_char_index != std::string::npos && written_out < all_content;
|
||||
// record what we've written this iteration, scan for next char that needs escaping
|
||||
written_out = escape_char_index + 1, escape_char_index = message.find_first_of("\\\n\r", written_out)
|
||||
)
|
||||
{
|
||||
// found a character that needs escaping, so write up to that with the escape prefix
|
||||
// note that escape_char_index is relative to the start, not to the written_out offset
|
||||
out << message.substr(written_out, escape_char_index - written_out) << '\\';
|
||||
|
||||
// write out the appropriate second character in the escape sequence
|
||||
char found = message[escape_char_index];
|
||||
switch ( found )
|
||||
{
|
||||
case '\\':
|
||||
out << '\\';
|
||||
break;
|
||||
case '\n':
|
||||
out << 'n';
|
||||
break;
|
||||
case '\r':
|
||||
out << 'r';
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if ( written_out < all_content ) // if the loop above didn't write everything
|
||||
{
|
||||
// write whatever was left
|
||||
out << message.substr(written_out, std::string::npos);
|
||||
}
|
||||
}
|
||||
|
||||
void writeToRecorders(const LLError::CallSite& site, const std::string& escaped_message, bool show_location = true, bool show_time = true, bool show_tags = true, bool show_level = true, bool show_function = true)
|
||||
{
|
||||
LLError::ELevel level = site.mLevel;
|
||||
LLError::SettingsConfigPtr s = LLError::Settings::getInstance()->getSettingsConfig();
|
||||
|
|
@ -912,32 +957,37 @@ namespace
|
|||
|
||||
std::ostringstream message_stream;
|
||||
|
||||
if (show_time && r->wantsTime() && s->mTimeFunction != NULL)
|
||||
if (r->wantsTime() && s->mTimeFunction != NULL)
|
||||
{
|
||||
message_stream << s->mTimeFunction() << " ";
|
||||
message_stream << s->mTimeFunction();
|
||||
}
|
||||
|
||||
message_stream << " ";
|
||||
|
||||
if (show_level && r->wantsLevel())
|
||||
{
|
||||
message_stream << site.mLevelString << " ";
|
||||
message_stream << site.mLevelString;
|
||||
}
|
||||
message_stream << " ";
|
||||
|
||||
if (show_tags && r->wantsTags())
|
||||
if (r->wantsTags())
|
||||
{
|
||||
message_stream << site.mTagString;
|
||||
}
|
||||
message_stream << " ";
|
||||
|
||||
if (show_location && (r->wantsLocation() || level == LLError::LEVEL_ERROR || s->mPrintLocation))
|
||||
if (r->wantsLocation() || level == LLError::LEVEL_ERROR || s->mPrintLocation)
|
||||
{
|
||||
message_stream << site.mLocationString << " ";
|
||||
message_stream << site.mLocationString;
|
||||
}
|
||||
message_stream << " ";
|
||||
|
||||
if (show_function && r->wantsFunctionName())
|
||||
{
|
||||
message_stream << site.mFunctionString << " ";
|
||||
message_stream << site.mFunctionString;
|
||||
}
|
||||
message_stream << " : ";
|
||||
|
||||
message_stream << message;
|
||||
message_stream << escaped_message;
|
||||
|
||||
r->recordMessage(level, message_stream.str());
|
||||
}
|
||||
|
|
@ -1180,11 +1230,6 @@ namespace LLError
|
|||
delete out;
|
||||
}
|
||||
|
||||
if (site.mLevel == LEVEL_ERROR)
|
||||
{
|
||||
writeToRecorders(site, "error", true, true, true, false, false);
|
||||
}
|
||||
|
||||
std::ostringstream message_stream;
|
||||
|
||||
if (site.mPrintOnce)
|
||||
|
|
@ -1210,8 +1255,8 @@ namespace LLError
|
|||
}
|
||||
}
|
||||
|
||||
message_stream << message;
|
||||
|
||||
addEscapedMessage(message_stream, message);
|
||||
|
||||
writeToRecorders(site, message_stream.str());
|
||||
|
||||
if (site.mLevel == LEVEL_ERROR && s->mCrashFunction)
|
||||
|
|
|
|||
|
|
@ -146,11 +146,22 @@ const int LL_ERR_NOERR = 0;
|
|||
|
||||
will result in messages like:
|
||||
|
||||
WARN: LLFoo::doSomething: called with a big value for i: 283
|
||||
WARN #FooBarTag# llcommon/llfoo(100) LLFoo::doSomething : called with a big value for i: 283
|
||||
|
||||
the syntax is:
|
||||
<timestamp> SPACE <level> SPACE <tags> SPACE <location> SPACE <function> SPACE COLON SPACE <message>
|
||||
|
||||
where each SPACE is a single space character; note that if a field is empty (such as when no
|
||||
tags are specified), all the SPACEs are still present.
|
||||
|
||||
The tags must be a single word (may not contain a space); if more than one tag is specified,
|
||||
they are all surrounded by '#' ( #FooTag#BarTag# ).
|
||||
|
||||
Which messages are logged and which are suppressed can be controlled at run
|
||||
time from the live file logcontrol.xml based on function, class and/or
|
||||
source file. See etc/logcontrol-dev.xml for details.
|
||||
time from the configuration file. The default configuration is in newview/app_settings/logcontrol.xml
|
||||
A copy of that file named logcontrol-dev.xml can be made in the users personal settings
|
||||
directory; that will override the installed default file. See the logcontrol.xml
|
||||
file or http://wiki.secondlife.com/wiki/Logging_System_Overview for configuration details.
|
||||
|
||||
Lastly, logging is now very efficient in both compiled code and execution
|
||||
when skipped. There is no need to wrap messages, even debugging ones, in
|
||||
|
|
|
|||
|
|
@ -610,7 +610,7 @@ private:
|
|||
value = (uint64_t)(( uint8_t *)&value);
|
||||
else
|
||||
{
|
||||
LL_WARNS("Unknown type returned from sysctl!") << LL_ENDL;
|
||||
LL_WARNS() << "Unknown type returned from sysctl" << LL_ENDL;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -36,6 +36,26 @@
|
|||
|
||||
#include "../test/lltut.h"
|
||||
|
||||
enum LogFieldIndex
|
||||
{
|
||||
TIME_FIELD,
|
||||
LEVEL_FIELD,
|
||||
TAGS_FIELD,
|
||||
LOCATION_FIELD,
|
||||
FUNCTION_FIELD,
|
||||
MSG_FIELD
|
||||
};
|
||||
|
||||
static const char* FieldName[] =
|
||||
{
|
||||
"TIME",
|
||||
"LEVEL",
|
||||
"TAGS",
|
||||
"LOCATION",
|
||||
"FUNCTION",
|
||||
"MSG"
|
||||
};
|
||||
|
||||
namespace
|
||||
{
|
||||
#ifdef __clang__
|
||||
|
|
@ -58,7 +78,7 @@ namespace tut
|
|||
class TestRecorder : public LLError::Recorder
|
||||
{
|
||||
public:
|
||||
TestRecorder() { mWantsTime = false; }
|
||||
TestRecorder() { mWantsTime = false; mWantsTags = true; }
|
||||
virtual ~TestRecorder() { }
|
||||
|
||||
virtual void recordMessage(LLError::ELevel level,
|
||||
|
|
@ -133,13 +153,64 @@ namespace tut
|
|||
ensure_equals("message count", countMessages(), expectedCount);
|
||||
}
|
||||
|
||||
void ensure_message_contains(int n, const std::string& expectedText)
|
||||
{
|
||||
std::ostringstream test_name;
|
||||
test_name << "testing message " << n;
|
||||
std::string message_field(int msgnum, LogFieldIndex fieldnum)
|
||||
{
|
||||
std::ostringstream test_name;
|
||||
test_name << "testing message " << msgnum << ", not enough messages";
|
||||
tut::ensure(test_name.str(), msgnum < countMessages());
|
||||
|
||||
ensure_contains(test_name.str(), message(n), expectedText);
|
||||
}
|
||||
std::string msg(message(msgnum));
|
||||
|
||||
std::string field_value;
|
||||
|
||||
// find the start of the field; fields are separated by a single space
|
||||
size_t scan = 0;
|
||||
int on_field = 0;
|
||||
while ( scan < msg.length() && on_field < fieldnum )
|
||||
{
|
||||
// fields are delimited by one space
|
||||
if ( ' ' == msg[scan] )
|
||||
{
|
||||
if ( on_field < FUNCTION_FIELD )
|
||||
{
|
||||
on_field++;
|
||||
}
|
||||
// except function, which may have embedded spaces so ends with " : "
|
||||
else if ( ( on_field == FUNCTION_FIELD )
|
||||
&& ( ':' == msg[scan+1] && ' ' == msg[scan+2] )
|
||||
)
|
||||
{
|
||||
on_field++;
|
||||
scan +=2;
|
||||
}
|
||||
}
|
||||
scan++;
|
||||
}
|
||||
size_t start_field = scan;
|
||||
size_t fieldlen = 0;
|
||||
if ( fieldnum < FUNCTION_FIELD )
|
||||
{
|
||||
fieldlen = msg.find(' ', start_field) - start_field;
|
||||
}
|
||||
else if ( fieldnum == FUNCTION_FIELD )
|
||||
{
|
||||
fieldlen = msg.find(" : ", start_field) - start_field;
|
||||
}
|
||||
else if ( MSG_FIELD == fieldnum ) // no delimiter, just everything to the end
|
||||
{
|
||||
fieldlen = msg.length() - start_field;
|
||||
}
|
||||
|
||||
return msg.substr(start_field, fieldlen);
|
||||
}
|
||||
|
||||
void ensure_message_field_equals(int msgnum, LogFieldIndex fieldnum, const std::string& expectedText)
|
||||
{
|
||||
std::ostringstream test_name;
|
||||
test_name << "testing message " << msgnum << " field " << FieldName[fieldnum] << "\n message: \"" << message(msgnum) << "\"\n ";
|
||||
|
||||
ensure_equals(test_name.str(), message_field(msgnum, fieldnum), expectedText);
|
||||
}
|
||||
|
||||
void ensure_message_does_not_contain(int n, const std::string& expectedText)
|
||||
{
|
||||
|
|
@ -162,8 +233,8 @@ namespace tut
|
|||
LL_INFOS() << "test" << LL_ENDL;
|
||||
LL_INFOS() << "bob" << LL_ENDL;
|
||||
|
||||
ensure_message_contains(0, "test");
|
||||
ensure_message_contains(1, "bob");
|
||||
ensure_message_field_equals(0, MSG_FIELD, "test");
|
||||
ensure_message_field_equals(1, MSG_FIELD, "bob");
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -171,11 +242,10 @@ namespace
|
|||
{
|
||||
void writeSome()
|
||||
{
|
||||
LL_DEBUGS() << "one" << LL_ENDL;
|
||||
LL_INFOS() << "two" << LL_ENDL;
|
||||
LL_WARNS() << "three" << LL_ENDL;
|
||||
// fatal messages write out an additional "error" message
|
||||
LL_ERRS() << "four" << LL_ENDL;
|
||||
LL_DEBUGS("WriteTag","AnotherTag") << "one" << LL_ENDL;
|
||||
LL_INFOS("WriteTag") << "two" << LL_ENDL;
|
||||
LL_WARNS("WriteTag") << "three" << LL_ENDL;
|
||||
LL_ERRS("WriteTag") << "four" << LL_ENDL;
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -187,37 +257,41 @@ namespace tut
|
|||
{
|
||||
LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
|
||||
writeSome();
|
||||
ensure_message_contains(0, "one");
|
||||
ensure_message_contains(1, "two");
|
||||
ensure_message_contains(2, "three");
|
||||
ensure_message_contains(3, "error");
|
||||
ensure_message_contains(4, "four");
|
||||
ensure_message_count(5);
|
||||
ensure_message_field_equals(0, MSG_FIELD, "one");
|
||||
ensure_message_field_equals(0, LEVEL_FIELD, "DEBUG");
|
||||
ensure_message_field_equals(0, TAGS_FIELD, "#WriteTag#AnotherTag#");
|
||||
ensure_message_field_equals(1, MSG_FIELD, "two");
|
||||
ensure_message_field_equals(1, LEVEL_FIELD, "INFO");
|
||||
ensure_message_field_equals(1, TAGS_FIELD, "#WriteTag#");
|
||||
ensure_message_field_equals(2, MSG_FIELD, "three");
|
||||
ensure_message_field_equals(2, LEVEL_FIELD, "WARNING");
|
||||
ensure_message_field_equals(2, TAGS_FIELD, "#WriteTag#");
|
||||
ensure_message_field_equals(3, MSG_FIELD, "four");
|
||||
ensure_message_field_equals(3, LEVEL_FIELD, "ERROR");
|
||||
ensure_message_field_equals(3, TAGS_FIELD, "#WriteTag#");
|
||||
ensure_message_count(4);
|
||||
|
||||
LLError::setDefaultLevel(LLError::LEVEL_INFO);
|
||||
writeSome();
|
||||
ensure_message_contains(5, "two");
|
||||
ensure_message_contains(6, "three");
|
||||
ensure_message_contains(7, "error");
|
||||
ensure_message_contains(8, "four");
|
||||
ensure_message_count(9);
|
||||
ensure_message_field_equals(4, MSG_FIELD, "two");
|
||||
ensure_message_field_equals(5, MSG_FIELD, "three");
|
||||
ensure_message_field_equals(6, MSG_FIELD, "four");
|
||||
ensure_message_count(7);
|
||||
|
||||
LLError::setDefaultLevel(LLError::LEVEL_WARN);
|
||||
writeSome();
|
||||
ensure_message_contains(9, "three");
|
||||
ensure_message_contains(10, "error");
|
||||
ensure_message_contains(11, "four");
|
||||
ensure_message_count(12);
|
||||
ensure_message_field_equals(7, MSG_FIELD, "three");
|
||||
ensure_message_field_equals(8, MSG_FIELD, "four");
|
||||
ensure_message_count(9);
|
||||
|
||||
LLError::setDefaultLevel(LLError::LEVEL_ERROR);
|
||||
writeSome();
|
||||
ensure_message_contains(12, "error");
|
||||
ensure_message_contains(13, "four");
|
||||
ensure_message_count(14);
|
||||
ensure_message_field_equals(9, MSG_FIELD, "four");
|
||||
ensure_message_count(10);
|
||||
|
||||
LLError::setDefaultLevel(LLError::LEVEL_NONE);
|
||||
writeSome();
|
||||
ensure_message_count(14);
|
||||
ensure_message_count(10);
|
||||
}
|
||||
|
||||
template<> template<>
|
||||
|
|
@ -225,12 +299,11 @@ namespace tut
|
|||
// error type string in output
|
||||
{
|
||||
writeSome();
|
||||
ensure_message_contains(0, "DEBUG: ");
|
||||
ensure_message_contains(1, "INFO: ");
|
||||
ensure_message_contains(2, "WARNING: ");
|
||||
ensure_message_does_not_contain(3, "ERROR");
|
||||
ensure_message_contains(4, "ERROR: ");
|
||||
ensure_message_count(5);
|
||||
ensure_message_field_equals(0, LEVEL_FIELD, "DEBUG");
|
||||
ensure_message_field_equals(1, LEVEL_FIELD, "INFO");
|
||||
ensure_message_field_equals(2, LEVEL_FIELD, "WARNING");
|
||||
ensure_message_field_equals(3, LEVEL_FIELD, "ERROR");
|
||||
ensure_message_count(4);
|
||||
}
|
||||
|
||||
template<> template<>
|
||||
|
|
@ -280,7 +353,7 @@ namespace
|
|||
{
|
||||
std::ostringstream location;
|
||||
location << LLError::abbreviateFile(__FILE__)
|
||||
<< "(" << line << ") : ";
|
||||
<< "(" << line << ")";
|
||||
|
||||
return location.str();
|
||||
}
|
||||
|
|
@ -321,7 +394,7 @@ namespace tut
|
|||
writeReturningLocation();
|
||||
|
||||
ensure_message_does_not_contain(0, location);
|
||||
ensure_message_contains(1, location);
|
||||
ensure_message_field_equals(1, LOCATION_FIELD, location);
|
||||
ensure_message_does_not_contain(2, location);
|
||||
}
|
||||
}
|
||||
|
|
@ -496,13 +569,13 @@ namespace tut
|
|||
void ErrorTestObject::test<7>()
|
||||
{
|
||||
outerLogger();
|
||||
ensure_message_contains(0, "inside");
|
||||
ensure_message_contains(1, "outside(moo)");
|
||||
ensure_message_field_equals(0, MSG_FIELD, "inside");
|
||||
ensure_message_field_equals(1, MSG_FIELD, "outside(moo)");
|
||||
ensure_message_count(2);
|
||||
|
||||
metaLogger();
|
||||
ensure_message_contains(2, "logging");
|
||||
ensure_message_contains(3, "meta(baz)");
|
||||
ensure_message_field_equals(2, MSG_FIELD, "logging");
|
||||
ensure_message_field_equals(3, MSG_FIELD, "meta(baz)");
|
||||
ensure_message_count(4);
|
||||
}
|
||||
|
||||
|
|
@ -513,9 +586,9 @@ namespace tut
|
|||
LLError::setPrintLocation(false);
|
||||
std::string location = errorReturningLocation();
|
||||
|
||||
ensure_message_contains(0, location + "error");
|
||||
ensure_message_contains(1, "die");
|
||||
ensure_message_count(2);
|
||||
ensure_message_field_equals(0, LOCATION_FIELD, location);
|
||||
ensure_message_field_equals(0, MSG_FIELD, "die");
|
||||
ensure_message_count(1);
|
||||
|
||||
ensure("fatal callback called", fatalWasCalled);
|
||||
}
|
||||
|
|
@ -544,13 +617,13 @@ namespace tut
|
|||
|
||||
setWantsTime(false);
|
||||
ufoSighting();
|
||||
ensure_message_contains(0, "ufo");
|
||||
ensure_message_field_equals(0, MSG_FIELD, "ufo");
|
||||
ensure_message_does_not_contain(0, roswell());
|
||||
|
||||
setWantsTime(true);
|
||||
ufoSighting();
|
||||
ensure_message_contains(1, "ufo");
|
||||
ensure_message_contains(1, roswell());
|
||||
ensure_message_field_equals(1, MSG_FIELD, "ufo");
|
||||
ensure_message_field_equals(1, TIME_FIELD, roswell());
|
||||
}
|
||||
|
||||
template<> template<>
|
||||
|
|
@ -564,9 +637,9 @@ namespace tut
|
|||
function;
|
||||
writeReturningLocationAndFunction(location, function);
|
||||
|
||||
ensure_equals("order is time location type function message",
|
||||
ensure_equals("order is time level tags location function message",
|
||||
message(0),
|
||||
roswell() + " INFO: " + location + function + ": apple");
|
||||
roswell() + " INFO " + "# " /* no tag */ + location + " " + function + " : " + "apple");
|
||||
}
|
||||
|
||||
template<> template<>
|
||||
|
|
@ -578,7 +651,7 @@ namespace tut
|
|||
|
||||
LL_INFOS() << "boo" << LL_ENDL;
|
||||
|
||||
ensure_message_contains(0, "boo");
|
||||
ensure_message_field_equals(0, MSG_FIELD, "boo");
|
||||
ensure_equals("alt recorder count", boost::dynamic_pointer_cast<TestRecorder>(altRecorder)->countMessages(), 1);
|
||||
ensure_contains("alt recorder message 0", boost::dynamic_pointer_cast<TestRecorder>(altRecorder)->message(0), "boo");
|
||||
|
||||
|
|
@ -637,14 +710,12 @@ namespace tut
|
|||
TestAlpha::doAll();
|
||||
TestBeta::doAll();
|
||||
|
||||
ensure_message_contains(0, "aim west");
|
||||
ensure_message_contains(1, "error");
|
||||
ensure_message_contains(2, "ate eels");
|
||||
ensure_message_contains(3, "buy iron");
|
||||
ensure_message_contains(4, "bad word");
|
||||
ensure_message_contains(5, "error");
|
||||
ensure_message_contains(6, "big easy");
|
||||
ensure_message_count(7);
|
||||
ensure_message_field_equals(0, MSG_FIELD, "aim west");
|
||||
ensure_message_field_equals(1, MSG_FIELD, "ate eels");
|
||||
ensure_message_field_equals(2, MSG_FIELD, "buy iron");
|
||||
ensure_message_field_equals(3, MSG_FIELD, "bad word");
|
||||
ensure_message_field_equals(4, MSG_FIELD, "big easy");
|
||||
ensure_message_count(5);
|
||||
}
|
||||
|
||||
template<> template<>
|
||||
|
|
@ -657,8 +728,8 @@ namespace tut
|
|||
LLError::setFunctionLevel("TestBeta::doError", LLError::LEVEL_NONE);
|
||||
|
||||
TestBeta::doAll();
|
||||
ensure_message_contains(0, "buy iron");
|
||||
ensure_message_contains(1, "bad word");
|
||||
ensure_message_field_equals(0, MSG_FIELD, "buy iron");
|
||||
ensure_message_field_equals(1, MSG_FIELD, "bad word");
|
||||
ensure_message_count(2);
|
||||
}
|
||||
|
||||
|
|
@ -678,9 +749,9 @@ namespace tut
|
|||
|
||||
TestAlpha::doAll();
|
||||
TestBeta::doAll();
|
||||
ensure_message_contains(0, "any idea");
|
||||
ensure_message_contains(1, "aim west");
|
||||
ensure_message_contains(2, "bad word");
|
||||
ensure_message_field_equals(0, MSG_FIELD, "any idea");
|
||||
ensure_message_field_equals(1, MSG_FIELD, "aim west");
|
||||
ensure_message_field_equals(2, MSG_FIELD, "bad word");
|
||||
ensure_message_count(3);
|
||||
}
|
||||
|
||||
|
|
@ -718,14 +789,13 @@ namespace tut
|
|||
// configuration from LLSD
|
||||
void ErrorTestObject::test<16>()
|
||||
{
|
||||
std::string this_file = LLError::abbreviateFile(__FILE__);
|
||||
LLSD config;
|
||||
config["print-location"] = true;
|
||||
config["default-level"] = "DEBUG";
|
||||
|
||||
LLSD set1;
|
||||
set1["level"] = "WARN";
|
||||
set1["files"][0] = this_file;
|
||||
set1["files"][0] = LLError::abbreviateFile(__FILE__);
|
||||
|
||||
LLSD set2;
|
||||
set2["level"] = "INFO";
|
||||
|
|
@ -744,10 +814,9 @@ namespace tut
|
|||
|
||||
TestAlpha::doAll();
|
||||
TestBeta::doAll();
|
||||
ensure_message_contains(0, "any idea");
|
||||
ensure_message_contains(0, this_file);
|
||||
ensure_message_contains(1, "aim west");
|
||||
ensure_message_contains(2, "bad word");
|
||||
ensure_message_field_equals(0, MSG_FIELD, "any idea");
|
||||
ensure_message_field_equals(1, MSG_FIELD, "aim west");
|
||||
ensure_message_field_equals(2, MSG_FIELD, "bad word");
|
||||
ensure_message_count(3);
|
||||
|
||||
// make sure reconfiguring works
|
||||
|
|
@ -758,17 +827,75 @@ namespace tut
|
|||
|
||||
TestAlpha::doAll();
|
||||
TestBeta::doAll();
|
||||
ensure_message_contains(3, "aim west");
|
||||
ensure_message_does_not_contain(3, this_file);
|
||||
ensure_message_contains(4, "error");
|
||||
ensure_message_contains(5, "ate eels");
|
||||
ensure_message_contains(6, "bad word");
|
||||
ensure_message_contains(7, "error");
|
||||
ensure_message_contains(8, "big easy");
|
||||
ensure_message_count(9);
|
||||
ensure_message_field_equals(3, MSG_FIELD, "aim west");
|
||||
ensure_message_field_equals(4, MSG_FIELD, "ate eels");
|
||||
ensure_message_field_equals(5, MSG_FIELD, "bad word");
|
||||
ensure_message_field_equals(6, MSG_FIELD, "big easy");
|
||||
ensure_message_count(7);
|
||||
}
|
||||
}
|
||||
|
||||
namespace
|
||||
{
|
||||
void writeMsgNeedsEscaping()
|
||||
{
|
||||
LL_DEBUGS("WriteTag") << "backslash\\" << LL_ENDL;
|
||||
LL_INFOS("WriteTag") << "newline\nafternewline" << LL_ENDL;
|
||||
LL_WARNS("WriteTag") << "return\rafterreturn" << LL_ENDL;
|
||||
|
||||
LL_DEBUGS("WriteTag") << "backslash\\backslash\\" << LL_ENDL;
|
||||
LL_INFOS("WriteTag") << "backslash\\newline\nanothernewline\nafternewline" << LL_ENDL;
|
||||
LL_WARNS("WriteTag") << "backslash\\returnnewline\r\n\\afterbackslash" << LL_ENDL;
|
||||
}
|
||||
};
|
||||
|
||||
namespace tut
|
||||
{
|
||||
template<> template<>
|
||||
void ErrorTestObject::test<17>()
|
||||
// backslash, return, and newline are escaped with backslashes
|
||||
{
|
||||
LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
|
||||
writeMsgNeedsEscaping();
|
||||
ensure_message_field_equals(0, MSG_FIELD, "backslash\\\\");
|
||||
ensure_message_field_equals(1, MSG_FIELD, "newline\\nafternewline");
|
||||
ensure_message_field_equals(2, MSG_FIELD, "return\\rafterreturn");
|
||||
ensure_message_field_equals(3, MSG_FIELD, "backslash\\\\backslash\\\\");
|
||||
ensure_message_field_equals(4, MSG_FIELD, "backslash\\\\newline\\nanothernewline\\nafternewline");
|
||||
ensure_message_field_equals(5, MSG_FIELD, "backslash\\\\returnnewline\\r\\n\\\\afterbackslash");
|
||||
ensure_message_count(6);
|
||||
}
|
||||
}
|
||||
|
||||
namespace
|
||||
{
|
||||
std::string writeTagWithSpaceReturningLocation()
|
||||
{
|
||||
LL_DEBUGS("Write Tag") << "not allowed" << LL_ENDL; int this_line = __LINE__;
|
||||
|
||||
std::ostringstream location;
|
||||
location << LLError::abbreviateFile(__FILE__).c_str() << "(" << this_line << ")";
|
||||
return location.str();
|
||||
}
|
||||
};
|
||||
|
||||
namespace tut
|
||||
{
|
||||
template<> template<>
|
||||
void ErrorTestObject::test<18>()
|
||||
// space character is not allowed in a tag
|
||||
{
|
||||
LLError::setDefaultLevel(LLError::LEVEL_DEBUG);
|
||||
fatalWasCalled = false;
|
||||
|
||||
std::string location = writeTagWithSpaceReturningLocation();
|
||||
std::string expected = "Space is not allowed in a log tag at " + location;
|
||||
ensure_message_field_equals(0, LEVEL_FIELD, "ERROR");
|
||||
ensure_message_field_equals(0, MSG_FIELD, expected);
|
||||
ensure("fatal callback called", fatalWasCalled);
|
||||
}
|
||||
}
|
||||
|
||||
/* Tests left:
|
||||
handling of classes without LOG_CLASS
|
||||
|
||||
|
|
|
|||
|
|
@ -101,7 +101,7 @@ void HTTPStats::dumpStats()
|
|||
out << (*it).first << " " << (*it).second << std::endl;
|
||||
}
|
||||
|
||||
LL_WARNS("HTTP Core") << out.str() << LL_ENDL;
|
||||
LL_WARNS("HTTPCore") << out.str() << LL_ENDL;
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
<map>
|
||||
<!-- default-level can be ALL, DEBUG, INFO, WARN, ERROR, or NONE -->
|
||||
<key>default-level</key> <string>INFO</string>
|
||||
<key>print-location</key> <boolean>false</boolean>
|
||||
<key>settings</key>
|
||||
<array>
|
||||
<!-- Suppress anything but ERROR for some very verbose components -->
|
||||
|
|
|
|||
|
|
@ -3118,7 +3118,7 @@ LLSD LLAppViewer::getViewerInfo() const
|
|||
}
|
||||
else
|
||||
{
|
||||
LL_WARNS("Driver version")<< "Cannot get driver version from getDriverVersionWMI" << LL_ENDL;
|
||||
LL_WARNS("DriverVersion")<< "Cannot get driver version from getDriverVersionWMI" << LL_ENDL;
|
||||
LLSD driver_info = gDXHardware.getDisplayInfo();
|
||||
if (driver_info.has("DriverVersion"))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -698,7 +698,7 @@ void LLAppViewerWin32::initCrashReporting(bool reportFreeze)
|
|||
&processInfo) == FALSE)
|
||||
// Could not start application -> call 'GetLastError()'
|
||||
{
|
||||
LL_WARNS("CrashReport Launch") << "CreateProcess failed " << GetLastError() << LL_ENDL;
|
||||
LL_WARNS("CrashReport") << "CreateProcess failed " << GetLastError() << LL_ENDL;
|
||||
return;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ void LLChicletBar::log(LLView* panel, const std::string& descr)
|
|||
{
|
||||
if (NULL == panel) return;
|
||||
LLView* layout = panel->getParent();
|
||||
LL_DEBUGS("Chiclet Bar Rects") << descr << ": "
|
||||
LL_DEBUGS("ChicletBarRects") << descr << ": "
|
||||
<< "panel: " << panel->getName()
|
||||
<< ", rect: " << panel->getRect()
|
||||
<< " layout: " << layout->getName()
|
||||
|
|
|
|||
|
|
@ -93,7 +93,7 @@ void LLEstateInfoModel::update(const strings_t& strings)
|
|||
mFlags = strtoul(strings[3].c_str(), NULL, 10);
|
||||
mSunHour = ((F32)(strtod(strings[4].c_str(), NULL)))/1024.0f;
|
||||
|
||||
LL_DEBUGS("Windlight Sync") << "Received estate info: "
|
||||
LL_DEBUGS("WindlightSync") << "Received estate info: "
|
||||
<< "is_sun_fixed = " << getUseFixedSun()
|
||||
<< ", sun_hour = " << getSunHour() << LL_ENDL;
|
||||
LL_DEBUGS() << getInfoDump() << LL_ENDL;
|
||||
|
|
@ -151,7 +151,7 @@ void LLEstateInfoModel::commitEstateInfoCapsCoro(std::string url)
|
|||
|
||||
body["invoice"] = LLFloaterRegionInfo::getLastInvoice();
|
||||
|
||||
LL_DEBUGS("Windlight Sync") << "Sending estate caps: "
|
||||
LL_DEBUGS("WindlightSync") << "Sending estate caps: "
|
||||
<< "is_sun_fixed = " << getUseFixedSun()
|
||||
<< ", sun_hour = " << getSunHour() << LL_ENDL;
|
||||
LL_DEBUGS() << body << LL_ENDL;
|
||||
|
|
@ -181,7 +181,7 @@ void LLEstateInfoModel::commitEstateInfoCapsCoro(std::string url)
|
|||
// strings[3] = str((S32)(sun_hour * 1024.f))
|
||||
void LLEstateInfoModel::commitEstateInfoDataserver()
|
||||
{
|
||||
LL_DEBUGS("Windlight Sync") << "Sending estate info: "
|
||||
LL_DEBUGS("WindlightSync") << "Sending estate info: "
|
||||
<< "is_sun_fixed = " << getUseFixedSun()
|
||||
<< ", sun_hour = " << getSunHour() << LL_ENDL;
|
||||
LL_DEBUGS() << getInfoDump() << LL_ENDL;
|
||||
|
|
|
|||
|
|
@ -3248,14 +3248,14 @@ void LLPanelEnvironmentInfo::sendRegionSunUpdate()
|
|||
param_set.setAll(sky_map.beginMap()->second);
|
||||
F32 sun_angle = param_set.getSunAngle();
|
||||
|
||||
LL_DEBUGS("Windlight Sync") << "Old sun hour: " << region_info.mSunHour << LL_ENDL;
|
||||
LL_DEBUGS("WindlightSync") << "Old sun hour: " << region_info.mSunHour << LL_ENDL;
|
||||
// convert value range from 0..2pi to 6..30
|
||||
region_info.mSunHour = fmodf((sun_angle / F_TWO_PI) * 24.f, 24.f) + 6.f;
|
||||
}
|
||||
|
||||
region_info.setUseFixedSun(region_use_fixed_sky);
|
||||
region_info.mUseEstateSun = !region_use_fixed_sky;
|
||||
LL_DEBUGS("Windlight Sync") << "Sun hour: " << region_info.mSunHour << LL_ENDL;
|
||||
LL_DEBUGS("WindlightSync") << "Sun hour: " << region_info.mSunHour << LL_ENDL;
|
||||
|
||||
region_info.sendRegionTerrain(LLFloaterRegionInfo::getLastInvoice());
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1225,7 +1225,7 @@ void LLFloaterTools::getMediaState()
|
|||
if(!has_media_capability)
|
||||
{
|
||||
getChildView("add_media")->setEnabled(FALSE);
|
||||
LL_WARNS("LLFloaterTools: media") << "Media not enabled (no capability) in this region!" << LL_ENDL;
|
||||
LL_WARNS("LLFloaterToolsMedia") << "Media not enabled (no capability) in this region!" << LL_ENDL;
|
||||
clearMediaSettings();
|
||||
return;
|
||||
}
|
||||
|
|
@ -1249,7 +1249,7 @@ void LLFloaterTools::getMediaState()
|
|||
{
|
||||
if (!object->permModify())
|
||||
{
|
||||
LL_INFOS("LLFloaterTools: media")
|
||||
LL_INFOS("LLFloaterToolsMedia")
|
||||
<< "Selection not editable due to lack of modify permissions on object id "
|
||||
<< object->getID() << LL_ENDL;
|
||||
|
||||
|
|
@ -1262,7 +1262,7 @@ void LLFloaterTools::getMediaState()
|
|||
// contention as to whether this is a sufficient solution.
|
||||
// if (object->isMediaDataBeingFetched())
|
||||
// {
|
||||
// LL_INFOS("LLFloaterTools: media")
|
||||
// LL_INFOS("LLFloaterToolsMedia")
|
||||
// << "Selection not editable due to media data being fetched for object id "
|
||||
// << object->getID() << LL_ENDL;
|
||||
//
|
||||
|
|
|
|||
|
|
@ -1255,7 +1255,7 @@ void LLPanelFace::updateUI(bool force_set_values /*false*/)
|
|||
|
||||
if (material && editable)
|
||||
{
|
||||
LL_DEBUGS("Materials: OnMatererialsLoaded:") << material->asLLSD() << LL_ENDL;
|
||||
LL_DEBUGS("Materials") << material->asLLSD() << LL_ENDL;
|
||||
|
||||
// Alpha
|
||||
LLCtrlSelectionInterface* combobox_alphamode =
|
||||
|
|
|
|||
|
|
@ -158,7 +158,7 @@ void LLRegionInfoModel::update(LLMessageSystem* msg)
|
|||
|
||||
// actually the "last set" sun hour, not the current sun hour. JC
|
||||
msg->getF32(_PREHASH_RegionInfo, _PREHASH_SunHour, mSunHour);
|
||||
LL_DEBUGS("Windlight Sync") << "Got region sun hour: " << mSunHour << LL_ENDL;
|
||||
LL_DEBUGS("WindlightSync") << "Got region sun hour: " << mSunHour << LL_ENDL;
|
||||
|
||||
msg->getS32Fast(_PREHASH_RegionInfo2, _PREHASH_HardMaxAgents, mHardAgentLimit);
|
||||
|
||||
|
|
|
|||
|
|
@ -716,7 +716,7 @@ BOOL LLViewerKeyboard::handleKey(KEY translated_key, MASK translated_mask, BOOL
|
|||
if(mKeysSkippedByUI.find(translated_key) != mKeysSkippedByUI.end())
|
||||
{
|
||||
mKeyHandledByUI[translated_key] = FALSE;
|
||||
LL_INFOS("Keyboard Handling") << "Key wasn't handled by UI!" << LL_ENDL;
|
||||
LL_INFOS("KeyboardHandling") << "Key wasn't handled by UI!" << LL_ENDL;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
|
|||
|
|
@ -3755,7 +3755,7 @@ void process_time_synch(LLMessageSystem *mesgsys, void **user_data)
|
|||
|
||||
LLWorld::getInstance()->setSpaceTimeUSec(space_time_usec);
|
||||
|
||||
LL_DEBUGS("Windlight Sync") << "Sun phase: " << phase << " rad = " << fmodf(phase / F_TWO_PI + 0.25, 1.f) * 24.f << " h" << LL_ENDL;
|
||||
LL_DEBUGS("WindlightSync") << "Sun phase: " << phase << " rad = " << fmodf(phase / F_TWO_PI + 0.25, 1.f) * 24.f << " h" << LL_ENDL;
|
||||
|
||||
gSky.setSunPhase(phase);
|
||||
gSky.setSunTargetDirection(sun_direction, sun_ang_velocity);
|
||||
|
|
|
|||
|
|
@ -456,7 +456,7 @@ void LLVivoxVoiceClient::updateSettings()
|
|||
bool LLVivoxVoiceClient::writeString(const std::string &str)
|
||||
{
|
||||
bool result = false;
|
||||
LL_DEBUGS("LOW Voice") << "sending:\n" << str << LL_ENDL;
|
||||
LL_DEBUGS("LowVoice") << "sending:\n" << str << LL_ENDL;
|
||||
|
||||
if(mConnected)
|
||||
{
|
||||
|
|
@ -7270,12 +7270,12 @@ void LLVivoxProtocolParser::processResponse(std::string tag)
|
|||
if (isEvent)
|
||||
{
|
||||
const char *eventTypeCstr = eventTypeString.c_str();
|
||||
LL_DEBUGS("LOW Voice") << eventTypeCstr << LL_ENDL;
|
||||
LL_DEBUGS("LowVoice") << eventTypeCstr << LL_ENDL;
|
||||
|
||||
if (!stricmp(eventTypeCstr, "ParticipantUpdatedEvent"))
|
||||
{
|
||||
// These happen so often that logging them is pretty useless.
|
||||
LL_DEBUGS("LOW Voice") << "Updated Params: " << sessionHandle << ", " << sessionGroupHandle << ", " << uriString << ", " << alias << ", " << isModeratorMuted << ", " << isSpeaking << ", " << volume << ", " << energy << LL_ENDL;
|
||||
LL_DEBUGS("LowVoice") << "Updated Params: " << sessionHandle << ", " << sessionGroupHandle << ", " << uriString << ", " << alias << ", " << isModeratorMuted << ", " << isSpeaking << ", " << volume << ", " << energy << LL_ENDL;
|
||||
LLVivoxVoiceClient::getInstance()->participantUpdatedEvent(sessionHandle, sessionGroupHandle, uriString, alias, isModeratorMuted, isSpeaking, volume, energy);
|
||||
}
|
||||
else if (!stricmp(eventTypeCstr, "AccountLoginStateChangeEvent"))
|
||||
|
|
@ -7344,7 +7344,7 @@ void LLVivoxProtocolParser::processResponse(std::string tag)
|
|||
<ParticipantType>0</ParticipantType>
|
||||
</Event>
|
||||
*/
|
||||
LL_DEBUGS("LOW Voice") << "Added Params: " << sessionHandle << ", " << sessionGroupHandle << ", " << uriString << ", " << alias << ", " << nameString << ", " << displayNameString << ", " << participantType << LL_ENDL;
|
||||
LL_DEBUGS("LowVoice") << "Added Params: " << sessionHandle << ", " << sessionGroupHandle << ", " << uriString << ", " << alias << ", " << nameString << ", " << displayNameString << ", " << participantType << LL_ENDL;
|
||||
LLVivoxVoiceClient::getInstance()->participantAddedEvent(sessionHandle, sessionGroupHandle, uriString, alias, nameString, displayNameString, participantType);
|
||||
}
|
||||
else if (!stricmp(eventTypeCstr, "ParticipantRemovedEvent"))
|
||||
|
|
@ -7357,7 +7357,7 @@ void LLVivoxProtocolParser::processResponse(std::string tag)
|
|||
<AccountName>xtx7YNV-3SGiG7rA1fo5Ndw==</AccountName>
|
||||
</Event>
|
||||
*/
|
||||
LL_DEBUGS("LOW Voice") << "Removed params:" << sessionHandle << ", " << sessionGroupHandle << ", " << uriString << ", " << alias << ", " << nameString << LL_ENDL;
|
||||
LL_DEBUGS("LowVoice") << "Removed params:" << sessionHandle << ", " << sessionGroupHandle << ", " << uriString << ", " << alias << ", " << nameString << LL_ENDL;
|
||||
|
||||
LLVivoxVoiceClient::getInstance()->participantRemovedEvent(sessionHandle, sessionGroupHandle, uriString, alias, nameString);
|
||||
}
|
||||
|
|
@ -7424,7 +7424,7 @@ void LLVivoxProtocolParser::processResponse(std::string tag)
|
|||
else
|
||||
{
|
||||
const char *actionCstr = actionString.c_str();
|
||||
LL_DEBUGS("LOW Voice") << actionCstr << LL_ENDL;
|
||||
LL_DEBUGS("LowVoice") << actionCstr << LL_ENDL;
|
||||
|
||||
if (!stricmp(actionCstr, "Session.Set3DPosition.1"))
|
||||
{
|
||||
|
|
|
|||
|
|
@ -172,7 +172,7 @@ void LLSimInfo::dump() const
|
|||
U32 x_pos, y_pos;
|
||||
from_region_handle(mHandle, &x_pos, &y_pos);
|
||||
|
||||
LL_INFOS("World Map") << x_pos << "," << y_pos
|
||||
LL_INFOS("WorldMap") << x_pos << "," << y_pos
|
||||
<< " " << mName
|
||||
<< " " << (S32)mAccess
|
||||
<< " " << std::hex << mRegionFlags << std::dec
|
||||
|
|
@ -229,7 +229,7 @@ LLWorldMap::LLWorldMap() :
|
|||
mTrackingLocation( 0, 0, 0 ),
|
||||
mFirstRequest(true)
|
||||
{
|
||||
//LL_INFOS("World Map") << "Creating the World Map -> LLWorldMap::LLWorldMap()" << LL_ENDL;
|
||||
//LL_INFOS("WorldMap") << "Creating the World Map -> LLWorldMap::LLWorldMap()" << LL_ENDL;
|
||||
mMapBlockLoaded = new bool[MAP_BLOCK_RES*MAP_BLOCK_RES];
|
||||
clearSimFlags();
|
||||
}
|
||||
|
|
@ -237,7 +237,7 @@ LLWorldMap::LLWorldMap() :
|
|||
|
||||
LLWorldMap::~LLWorldMap()
|
||||
{
|
||||
//LL_INFOS("World Map") << "Destroying the World Map -> LLWorldMap::~LLWorldMap()" << LL_ENDL;
|
||||
//LL_INFOS("WorldMap") << "Destroying the World Map -> LLWorldMap::~LLWorldMap()" << LL_ENDL;
|
||||
reset();
|
||||
delete[] mMapBlockLoaded;
|
||||
}
|
||||
|
|
@ -375,7 +375,7 @@ bool LLWorldMap::simNameFromPosGlobal(const LLVector3d& pos_global, std::string
|
|||
|
||||
void LLWorldMap::reloadItems(bool force)
|
||||
{
|
||||
//LL_INFOS("World Map") << "LLWorldMap::reloadItems()" << LL_ENDL;
|
||||
//LL_INFOS("WorldMap") << "LLWorldMap::reloadItems()" << LL_ENDL;
|
||||
if (clearItems(force))
|
||||
{
|
||||
LLWorldMapMessage::getInstance()->sendItemRequest(MAP_ITEM_TELEHUB);
|
||||
|
|
@ -407,7 +407,7 @@ bool LLWorldMap::insertRegion(U32 x_world, U32 y_world, std::string& name, LLUUI
|
|||
else
|
||||
{
|
||||
U64 handle = to_region_handle(x_world, y_world);
|
||||
//LL_INFOS("World Map") << "Map sim : " << name << ", ID : " << image_id.getString() << LL_ENDL;
|
||||
//LL_INFOS("WorldMap") << "Map sim : " << name << ", ID : " << image_id.getString() << LL_ENDL;
|
||||
// Insert the region in the region map of the world map
|
||||
// Loading the LLSimInfo object with what we got and insert it in the map
|
||||
LLSimInfo* siminfo = LLWorldMap::getInstance()->simInfoFromHandle(handle);
|
||||
|
|
@ -459,7 +459,7 @@ bool LLWorldMap::insertItem(U32 x_world, U32 y_world, std::string& name, LLUUID&
|
|||
siminfo = LLWorldMap::getInstance()->createSimInfoFromHandle(handle);
|
||||
}
|
||||
|
||||
//LL_INFOS("World Map") << "Process item : type = " << type << LL_ENDL;
|
||||
//LL_INFOS("WorldMap") << "Process item : type = " << type << LL_ENDL;
|
||||
switch (type)
|
||||
{
|
||||
case MAP_ITEM_TELEHUB: // telehubs
|
||||
|
|
@ -553,7 +553,7 @@ bool LLWorldMap::insertItem(U32 x_world, U32 y_world, std::string& name, LLUUID&
|
|||
}
|
||||
case MAP_ITEM_AGENT_LOCATIONS: // agent locations
|
||||
{
|
||||
// LL_INFOS("World Map") << "New Location " << new_item.mName << LL_ENDL;
|
||||
// LL_INFOS("WorldMap") << "New Location " << new_item.mName << LL_ENDL;
|
||||
if (extra > 0)
|
||||
{
|
||||
new_item.setCount(extra);
|
||||
|
|
@ -604,7 +604,7 @@ void LLWorldMap::updateRegions(S32 x0, S32 y0, S32 x1, S32 y1)
|
|||
S32 offset = block_x | (block_y * MAP_BLOCK_RES);
|
||||
if (!mMapBlockLoaded[offset])
|
||||
{
|
||||
//LL_INFOS("World Map") << "Loading Block (" << block_x << "," << block_y << ")" << LL_ENDL;
|
||||
//LL_INFOS("WorldMap") << "Loading Block (" << block_x << "," << block_y << ")" << LL_ENDL;
|
||||
LLWorldMapMessage::getInstance()->sendMapBlockRequest(block_x * MAP_BLOCK_SIZE, block_y * MAP_BLOCK_SIZE, (block_x * MAP_BLOCK_SIZE) + MAP_BLOCK_SIZE - 1, (block_y * MAP_BLOCK_SIZE) + MAP_BLOCK_SIZE - 1);
|
||||
mMapBlockLoaded[offset] = true;
|
||||
}
|
||||
|
|
@ -614,7 +614,7 @@ void LLWorldMap::updateRegions(S32 x0, S32 y0, S32 x1, S32 y1)
|
|||
|
||||
void LLWorldMap::dump()
|
||||
{
|
||||
LL_INFOS("World Map") << "LLWorldMap::dump()" << LL_ENDL;
|
||||
LL_INFOS("WorldMap") << "LLWorldMap::dump()" << LL_ENDL;
|
||||
for (sim_info_map_t::iterator it = mSimInfoMap.begin(); it != mSimInfoMap.end(); ++it)
|
||||
{
|
||||
LLSimInfo* info = it->second;
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@ LLWorldMapMessage::~LLWorldMapMessage()
|
|||
|
||||
void LLWorldMapMessage::sendItemRequest(U32 type, U64 handle)
|
||||
{
|
||||
//LL_INFOS("World Map") << "Send item request : type = " << type << LL_ENDL;
|
||||
//LL_INFOS("WorldMap") << "Send item request : type = " << type << LL_ENDL;
|
||||
LLMessageSystem* msg = gMessageSystem;
|
||||
|
||||
msg->newMessageFast(_PREHASH_MapItemRequest);
|
||||
|
|
@ -74,7 +74,7 @@ void LLWorldMapMessage::sendItemRequest(U32 type, U64 handle)
|
|||
|
||||
void LLWorldMapMessage::sendNamedRegionRequest(std::string region_name)
|
||||
{
|
||||
//LL_INFOS("World Map") << "LLWorldMap::sendNamedRegionRequest()" << LL_ENDL;
|
||||
//LL_INFOS("WorldMap") << LL_ENDL;
|
||||
LLMessageSystem* msg = gMessageSystem;
|
||||
|
||||
// Request for region data
|
||||
|
|
@ -95,7 +95,7 @@ void LLWorldMapMessage::sendNamedRegionRequest(std::string region_name,
|
|||
const std::string& callback_url,
|
||||
bool teleport) // immediately teleport when result returned
|
||||
{
|
||||
//LL_INFOS("World Map") << "LLWorldMap::sendNamedRegionRequest()" << LL_ENDL;
|
||||
//LL_INFOS("WorldMap") << LL_ENDL;
|
||||
mSLURLRegionName = region_name;
|
||||
mSLURLRegionHandle = 0;
|
||||
mSLURL = callback_url;
|
||||
|
|
@ -110,7 +110,7 @@ void LLWorldMapMessage::sendHandleRegionRequest(U64 region_handle,
|
|||
const std::string& callback_url,
|
||||
bool teleport) // immediately teleport when result returned
|
||||
{
|
||||
//LL_INFOS("World Map") << "LLWorldMap::sendHandleRegionRequest()" << LL_ENDL;
|
||||
//LL_INFOS("WorldMap") << LL_ENDL;
|
||||
mSLURLRegionName.clear();
|
||||
mSLURLRegionHandle = region_handle;
|
||||
mSLURL = callback_url;
|
||||
|
|
@ -128,7 +128,7 @@ void LLWorldMapMessage::sendHandleRegionRequest(U64 region_handle,
|
|||
|
||||
void LLWorldMapMessage::sendMapBlockRequest(U16 min_x, U16 min_y, U16 max_x, U16 max_y, bool return_nonexistent)
|
||||
{
|
||||
//LL_INFOS("World Map") << "LLWorldMap::sendMapBlockRequest()" << ", min = (" << min_x << ", " << min_y << "), max = (" << max_x << ", " << max_y << "), nonexistent = " << return_nonexistent << LL_ENDL;
|
||||
//LL_INFOS("WorldMap" << " min = (" << min_x << ", " << min_y << "), max = (" << max_x << ", " << max_y << ", nonexistent = " << return_nonexistent << LL_ENDL;
|
||||
LLMessageSystem* msg = gMessageSystem;
|
||||
msg->newMessageFast(_PREHASH_MapBlockRequest);
|
||||
msg->nextBlockFast(_PREHASH_AgentData);
|
||||
|
|
@ -161,7 +161,7 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**)
|
|||
}
|
||||
|
||||
S32 num_blocks = msg->getNumberOfBlocksFast(_PREHASH_Data);
|
||||
//LL_INFOS("World Map") << "LLWorldMap::processMapBlockReply(), num_blocks = " << num_blocks << LL_ENDL;
|
||||
//LL_INFOS("WorldMap") << "num_blocks = " << num_blocks << LL_ENDL;
|
||||
|
||||
bool found_null_sim = false;
|
||||
|
||||
|
|
@ -233,7 +233,7 @@ void LLWorldMapMessage::processMapBlockReply(LLMessageSystem* msg, void**)
|
|||
// public static
|
||||
void LLWorldMapMessage::processMapItemReply(LLMessageSystem* msg, void**)
|
||||
{
|
||||
//LL_INFOS("World Map") << "LLWorldMap::processMapItemReply()" << LL_ENDL;
|
||||
//LL_INFOS("WorldMap") << LL_ENDL;
|
||||
U32 type;
|
||||
msg->getU32Fast(_PREHASH_RequestData, _PREHASH_ItemType, type);
|
||||
|
||||
|
|
|
|||
|
|
@ -177,7 +177,7 @@ LLWorldMapView::LLWorldMapView()
|
|||
mMouseDownY( 0 ),
|
||||
mSelectIDStart(0)
|
||||
{
|
||||
//LL_INFOS("World Map") << "Creating the Map -> LLWorldMapView::LLWorldMapView()" << LL_ENDL;
|
||||
//LL_INFOS("WorldMap") << "Creating the Map -> LLWorldMapView::LLWorldMapView()" << LL_ENDL;
|
||||
|
||||
clearLastClick();
|
||||
}
|
||||
|
|
@ -217,7 +217,7 @@ BOOL LLWorldMapView::postBuild()
|
|||
|
||||
LLWorldMapView::~LLWorldMapView()
|
||||
{
|
||||
//LL_INFOS("World Map") << "Destroying the map -> LLWorldMapView::~LLWorldMapView()" << LL_ENDL;
|
||||
//LL_INFOS("WorldMap") << "Destroying the map -> LLWorldMapView::~LLWorldMapView()" << LL_ENDL;
|
||||
cleanupTextures();
|
||||
}
|
||||
|
||||
|
|
@ -616,7 +616,7 @@ void LLWorldMapView::drawMipmap(S32 width, S32 height)
|
|||
}
|
||||
else
|
||||
{
|
||||
//LL_INFOS("World Map") << "Render complete, don't draw background..." << LL_ENDL;
|
||||
//LL_INFOS("WorldMap") << "Render complete, don't draw background..." << LL_ENDL;
|
||||
}
|
||||
|
||||
// Render the current level
|
||||
|
|
@ -705,7 +705,7 @@ bool LLWorldMapView::drawMipmapLevel(S32 width, S32 height, S32 level, bool load
|
|||
//else
|
||||
//{
|
||||
// Waiting for a tile -> the level is not complete
|
||||
// LL_INFOS("World Map") << "Unfetched tile. level = " << level << LL_ENDL;
|
||||
// LL_INFOS("WorldMap") << "Unfetched tile. level = " << level << LL_ENDL;
|
||||
//}
|
||||
}
|
||||
else
|
||||
|
|
@ -1668,7 +1668,7 @@ void LLWorldMapView::updateVisibleBlocks()
|
|||
S32 world_bottom = world_center_y - S32(half_height / sMapScale) - 1;
|
||||
S32 world_top = world_center_y + S32(half_height / sMapScale) + 1;
|
||||
|
||||
//LL_INFOS("World Map") << "LLWorldMapView::updateVisibleBlocks() : sMapScale = " << sMapScale << ", left = " << world_left << ", right = " << world_right << ", bottom = " << world_bottom << ", top = " << world_top << LL_ENDL;
|
||||
//LL_INFOS("WorldMap") << "LLWorldMapView::updateVisibleBlocks() : sMapScale = " << sMapScale << ", left = " << world_left << ", right = " << world_right << ", bottom = " << world_bottom << ", top = " << world_top << LL_ENDL;
|
||||
LLWorldMap::getInstance()->updateRegions(world_left, world_bottom, world_right, world_top);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -100,7 +100,7 @@ void LLWorldMipmap::equalizeBoostLevels()
|
|||
}
|
||||
}
|
||||
#if DEBUG_TILES_STAT
|
||||
LL_INFOS("World Map") << "LLWorldMipmap tile stats : total requested = " << nb_tiles << ", visible = " << nb_visible << ", missing = " << nb_missing << LL_ENDL;
|
||||
LL_INFOS("WorldMap") << "LLWorldMipmap tile stats : total requested = " << nb_tiles << ", visible = " << nb_visible << ", missing = " << nb_missing << LL_ENDL;
|
||||
#endif // DEBUG_TILES_STAT
|
||||
}
|
||||
|
||||
|
|
@ -187,7 +187,7 @@ LLPointer<LLViewerFetchedTexture> LLWorldMipmap::loadObjectsTile(U32 grid_x, U32
|
|||
// Use a local jpeg for every tile to test map speed without S3 access
|
||||
//imageurl = "file://C:\\Develop\\mapserver-distribute-3\\indra\\build-vc80\\mapserver\\relwithdebinfo\\regions\\00995\\01001\\region-995-1001-prims.jpg";
|
||||
// END DEBUG
|
||||
//LL_INFOS("World Map") << "LLWorldMipmap::loadObjectsTile(), URL = " << imageurl << LL_ENDL;
|
||||
//LL_INFOS("WorldMap") << "LLWorldMipmap::loadObjectsTile(), URL = " << imageurl << LL_ENDL;
|
||||
|
||||
LLPointer<LLViewerFetchedTexture> img = LLViewerTextureManager::getFetchedTextureFromUrl(imageurl, FTT_MAP_TILE, TRUE, LLGLTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE);
|
||||
img->setBoostLevel(LLGLTexture::BOOST_MAP);
|
||||
|
|
|
|||
Loading…
Reference in New Issue