summaryrefslogtreecommitdiff
path: root/indra/newview/llagentlistener.cpp
diff options
context:
space:
mode:
authorRoxanne Skelly <roxie@lindenlab.com>2009-07-09 20:56:23 +0000
committerRoxanne Skelly <roxie@lindenlab.com>2009-07-09 20:56:23 +0000
commit7a64aad1def1b0612addbf2e66c66db061d7e182 (patch)
tree2e011e8b58933e692c0cae738a4382a37e3e222b /indra/newview/llagentlistener.cpp
parent311aaf7ffd8f7dc95dba84f10fcae97bc93901bb (diff)
DEV-34822 - merge 1.23
merge -r119443 - basic slurl handling ignore dead branch
Diffstat (limited to 'indra/newview/llagentlistener.cpp')
-rw-r--r--indra/newview/llagentlistener.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/indra/newview/llagentlistener.cpp b/indra/newview/llagentlistener.cpp
index b3ed7c353e..7a8205acb5 100644
--- a/indra/newview/llagentlistener.cpp
+++ b/indra/newview/llagentlistener.cpp
@@ -53,7 +53,10 @@ void LLAgentListener::requestTeleport(LLSD const & event_data) const
}
else
{
- std::string url = LLSLURL::buildSLURL(event_data["regionname"], event_data["x"], event_data["y"], event_data["z"]);
+ std::string url = LLSLURL(event_data["regionname"],
+ LLVector3(event_data["x"].asReal(),
+ event_data["y"].asReal(),
+ event_data["z"].asReal())).getSLURLString();
LLURLDispatcher::dispatch(url, NULL, false);
}
}