summaryrefslogtreecommitdiff
path: root/indra/newview/llstartup.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-01-22 18:29:29 -0800
committerJames Cook <james@lindenlab.com>2010-01-22 18:29:29 -0800
commit40907986d4044e2be75f862fac1153f9a14f13ad (patch)
tree33502b643942323cc9670f548c85ff3e78a1dc55 /indra/newview/llstartup.cpp
parent1ddd2f2677471cc00465b2a619b138bb054db770 (diff)
Pull llurlentryagent into newview so I can compile/link faster
Diffstat (limited to 'indra/newview/llstartup.cpp')
-rw-r--r--indra/newview/llstartup.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp
index 6b816f8786..a372ab44f2 100644
--- a/indra/newview/llstartup.cpp
+++ b/indra/newview/llstartup.cpp
@@ -144,7 +144,9 @@
#include "llui.h"
#include "llurldispatcher.h"
#include "llurlsimstring.h"
+#include "llurlentryagent.h" // IDEVO
#include "llurlhistory.h"
+#include "llurlregistry.h" // IDEVO
#include "llurlwhitelist.h"
#include "llvieweraudio.h"
#include "llviewerassetstorage.h"
@@ -1282,6 +1284,9 @@ bool idle_startup()
gCacheName->LocalizeCacheName("none", LLTrans::getString("GroupNameNone"));
// Load stored cache if possible
LLAppViewer::instance()->loadNameCache();
+
+ // Handle secondlife:///app/agent name lookups IDEVO
+ LLUrlRegistry::getInstance()->registerUrl(new LLUrlEntryAgent(), true);
}
// *Note: this is where gWorldMap used to be initialized.