diff options
| author | Aleric Inglewood | 2010-10-22 00:51:53 +0200 |
|---|---|---|
| committer | Aleric Inglewood | 2010-10-22 00:51:53 +0200 |
| commit | 7c4e01af677907b75694b9c4827d6f3ba56a5e19 (patch) | |
| tree | fd743d3cefc7d4e671c6a6429be50e76191bbd9c /linden/indra/llrender | |
| parent | Don't dump callstacks at clean exit of viewer. (diff) | |
| parent | Changed version to Experimental 2010.10.17 (diff) | |
| download | meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.zip meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.tar.gz meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.tar.bz2 meta-impy-7c4e01af677907b75694b9c4827d6f3ba56a5e19.tar.xz | |
Merge branch 'weekly' of http://github.com/imprudence/imprudence into weekly
Diffstat (limited to 'linden/indra/llrender')
| -rw-r--r-- | linden/indra/llrender/llfontregistry.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/linden/indra/llrender/llfontregistry.cpp b/linden/indra/llrender/llfontregistry.cpp index 2140dbd..9792a91 100644 --- a/linden/indra/llrender/llfontregistry.cpp +++ b/linden/indra/llrender/llfontregistry.cpp | |||
| @@ -107,7 +107,7 @@ bool removeSubString(std::string& str, const std::string& substr) | |||
| 107 | size_t pos = str.find(substr); | 107 | size_t pos = str.find(substr); |
| 108 | if (pos != string::npos) | 108 | if (pos != string::npos) |
| 109 | { | 109 | { |
| 110 | str.replace(pos,substr.length(),(const char *)NULL, 0); | 110 | str.erase(pos,substr.length()); |
| 111 | return true; | 111 | return true; |
| 112 | } | 112 | } |
| 113 | return false; | 113 | return false; |