summaryrefslogtreecommitdiff
path: root/indra/newview/llfloaterurlentry.cpp
diff options
context:
space:
mode:
authorTofu Linden <tofu.linden@lindenlab.com>2010-05-05 19:16:05 +0100
committerTofu Linden <tofu.linden@lindenlab.com>2010-05-05 19:16:05 +0100
commit8d9c7855ddbe3f4666a293f29f4d6c89730d10c5 (patch)
tree6d84364e513f68908f2fddcbd1a4a68ca1958062 /indra/newview/llfloaterurlentry.cpp
parent447bffcb532694fcc3bc3b046051f02ac4550fd3 (diff)
parentf290e9e851e1af694cd8df86e171b79ed4186e90 (diff)
merge from viewer-public
Diffstat (limited to 'indra/newview/llfloaterurlentry.cpp')
-rw-r--r--indra/newview/llfloaterurlentry.cpp5
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