diff options
| author | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-05 21:10:51 +0300 |
|---|---|---|
| committer | Vadim Savchuk <vsavchuk@productengine.com> | 2010-05-05 21:10:51 +0300 |
| commit | 140c576c37e365bd1a616ae6eca1b7ce9f77ffab (patch) | |
| tree | 81e069b31fb25893cc3d8012116a66380455075d /indra/newview/llfloaterurlentry.cpp | |
| parent | f73f2c410e12abc2ccf3e0ae2719111cb285962a (diff) | |
| parent | e2e329b2e22dbab52d12ff309fb78533cb52c8e9 (diff) | |
Merge from default branch (first sync with dessie/viewer-public).
--HG--
branch : product-engine
Diffstat (limited to 'indra/newview/llfloaterurlentry.cpp')
| -rw-r--r-- | indra/newview/llfloaterurlentry.cpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/indra/newview/llfloaterurlentry.cpp b/indra/newview/llfloaterurlentry.cpp index 002d417e4c..0e802e9736 100644 --- a/indra/newview/llfloaterurlentry.cpp +++ b/indra/newview/llfloaterurlentry.cpp @@ -70,11 +70,6 @@ public: completeAny(status, mime_type); } - virtual void error( U32 status, const std::string& reason ) - { - completeAny(status, LLMIMETypes::getDefaultMimeType()); - } - void completeAny(U32 status, const std::string& mime_type) { // Set empty type to none/none. Empty string is reserved for legacy parcels |