summaryrefslogtreecommitdiff
path: root/indra/newview
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2010-05-04 16:53:39 -0400
committerLoren Shih <seraph@lindenlab.com>2010-05-04 16:53:39 -0400
commit9bb2a80be48b94725ae951488002ba5f96aeec63 (patch)
treea7c0a7215de9bb3179c32f22b03f41ad940d7cf4 /indra/newview
parent9ccb83520758ff8967ad7e32594074266504d4c2 (diff)
parent9d23a40c85dbaa800bafd8c468532301265ed6f3 (diff)
automated merge
Diffstat (limited to 'indra/newview')
-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