From f41b7bb8dff075d8c32ea03be407d20fe11e71f3 Mon Sep 17 00:00:00 2001 From: Steven Bennetts Date: Mon, 3 Dec 2007 19:44:04 +0000 Subject: -74901 (back out premature commit to release) --- indra/newview/llurldispatcher.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'indra/newview/llurldispatcher.cpp') diff --git a/indra/newview/llurldispatcher.cpp b/indra/newview/llurldispatcher.cpp index f8ebced8b9..51b9505980 100644 --- a/indra/newview/llurldispatcher.cpp +++ b/indra/newview/llurldispatcher.cpp @@ -37,12 +37,12 @@ #include "llcommandhandler.h" #include "llfloaterurldisplay.h" #include "llfloaterdirectory.h" -#include "llfloaterhtml.h" +#include "llfloaterhtmlhelp.h" +//#include "llfloaterworldmap.h" #include "llpanellogin.h" #include "llstartup.h" // gStartupState #include "llurlsimstring.h" #include "llviewerwindow.h" // alertXml() -#include "llweb.h" #include "llworldmap.h" // library includes @@ -340,11 +340,3 @@ bool LLURLDispatcher::dispatchRightClick(const std::string& url) { return LLURLDispatcherImpl::dispatchRightClick(url); } - -// static -std::string LLURLDispatcher::buildSLURL(const std::string& regionname, S32 x, S32 y, S32 z) -{ - std::string slurl = SLURL_SLURL_PREFIX + regionname + llformat("/%d/%d/%d",x,y,z); - slurl = LLWeb::escapeURL( slurl ); - return slurl; -} -- cgit v1.2.3