summaryrefslogtreecommitdiff
path: root/indra/llcommon/llerror.cpp
diff options
context:
space:
mode:
authorSteven Bennetts <steve@lindenlab.com>2008-06-26 00:39:00 +0000
committerSteven Bennetts <steve@lindenlab.com>2008-06-26 00:39:00 +0000
commit25c10ed028da5c547b11f1f461916897272b0e6d (patch)
tree350a5858f8970b6e28b2dc395625d74d8bd597b2 /indra/llcommon/llerror.cpp
parent6dd125d375b38455997a0c4b8747659f4c2351aa (diff)
QAR-628 merge string-cleanup-5 -r 90476:90508 -> release
dataserver-is-deprecated
Diffstat (limited to 'indra/llcommon/llerror.cpp')
-rw-r--r--indra/llcommon/llerror.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/indra/llcommon/llerror.cpp b/indra/llcommon/llerror.cpp
index 1d85bc0e70..b3d3122397 100644
--- a/indra/llcommon/llerror.cpp
+++ b/indra/llcommon/llerror.cpp
@@ -102,7 +102,7 @@ namespace {
public:
RecordToFile(const std::string& filename)
{
- mFile.open(filename.c_str(), llofstream::out | llofstream::app);
+ mFile.open(filename, llofstream::out | llofstream::app);
if (!mFile)
{
llinfos << "Error setting log file to " << filename << llendl;
@@ -196,7 +196,7 @@ namespace {
virtual void recordMessage(LLError::ELevel level,
const std::string& message)
{
- mBuffer.addLine(message.c_str());
+ mBuffer.addLine(message);
}
private:
@@ -305,7 +305,7 @@ namespace
std::string file = dirBase + "logcontrol-dev.xml";
llstat stat_info;
- if (LLFile::stat(file.c_str(), &stat_info)) {
+ if (LLFile::stat(file, &stat_info)) {
// NB: stat returns non-zero if it can't read the file, for example
// if it doesn't exist. LLFile has no better abstraction for
// testing for file existence.
@@ -321,7 +321,7 @@ namespace
LLSD configuration;
{
- llifstream file(filename().c_str());
+ llifstream file(filename());
if (file.is_open())
{
LLSDSerialize::fromXML(configuration, file);