diff options
| author | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
|---|---|---|
| committer | David Walter Seikel | 2013-07-15 03:59:58 +1000 |
| commit | c7f06e9e63a54874696fe89e2ef24c809bef51f3 (patch) | |
| tree | 3eb207f344435fbeb82b142000980416d50690cd /linden/indra/newview/llurlhistory.cpp | |
| parent | More Windlight refactoring, including moving the new stuff back to lightshare.c. (diff) | |
| parent | Fix Align tool conflicts with Edit Linked Parts - http://redmine.kokuaviewer.... (diff) | |
| download | meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.zip meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.gz meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.bz2 meta-impy-c7f06e9e63a54874696fe89e2ef24c809bef51f3.tar.xz | |
Merge remote-tracking branch 'origin/next' into WL-refactor
Diffstat (limited to 'linden/indra/newview/llurlhistory.cpp')
| -rw-r--r-- | linden/indra/newview/llurlhistory.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/linden/indra/newview/llurlhistory.cpp b/linden/indra/newview/llurlhistory.cpp index b187f3b..1d6c87f 100644 --- a/linden/indra/newview/llurlhistory.cpp +++ b/linden/indra/newview/llurlhistory.cpp | |||
| @@ -119,8 +119,6 @@ void LLURLHistory::addURL(const std::string& collection, const std::string& url) | |||
| 119 | // static | 119 | // static |
| 120 | void LLURLHistory::removeURL(const std::string& collection, const std::string& url) | 120 | void LLURLHistory::removeURL(const std::string& collection, const std::string& url) |
| 121 | { | 121 | { |
| 122 | LLSD::array_iterator iter = sHistorySD[collection].beginArray(); | ||
| 123 | LLSD::array_iterator end = sHistorySD[collection].endArray(); | ||
| 124 | for(int index = 0; index < sHistorySD[collection].size(); index++) | 122 | for(int index = 0; index < sHistorySD[collection].size(); index++) |
| 125 | { | 123 | { |
| 126 | if(sHistorySD[collection].get(index).asString() == url) | 124 | if(sHistorySD[collection].get(index).asString() == url) |