summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbrad kittenbrink <brad@lindenlab.com>2009-07-10 18:28:16 -0700
committerbrad kittenbrink <brad@lindenlab.com>2009-07-10 18:28:16 -0700
commitb6fec6f1fc30e6362471d442edda32d841bf30a1 (patch)
tree34b2ade8574e6ec052bd11a734a13d6c57b3cfda
parent9bc9a696882859d8194646d25bc606cdadd06fc2 (diff)
Fix for crash when running windows debug build. std::string::replace cannot take NULL for it's argument.
-rw-r--r--indra/llrender/llfontregistry.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llrender/llfontregistry.cpp b/indra/llrender/llfontregistry.cpp
index 18e4a6915d..455a68ca81 100644
--- a/indra/llrender/llfontregistry.cpp
+++ b/indra/llrender/llfontregistry.cpp
@@ -104,7 +104,7 @@ bool removeSubString(std::string& str, const std::string& substr)
size_t pos = str.find(substr);
if (pos != string::npos)
{
- str.replace(pos,substr.length(),(const char *)NULL, 0);
+ str.replace(pos,substr.length(), "", 0);
return true;
}
return false;