diff options
author | Oz Linden <oz@lindenlab.com> | 2011-09-06 17:00:55 -0400 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2011-09-06 17:00:55 -0400 |
commit | 82b1b1bc6ee91e1778a16634fb9e2988da23fd71 (patch) | |
tree | 779821c923eca8413bf7e21fd699b1af3ef7e6f3 /indra/newview/llslurl.cpp | |
parent | e2dea0b4947a1b0fefc1ddbe33ac74776128d1c5 (diff) | |
parent | fc45e9cbf6ea74412acd8bb55098cfd15493292b (diff) |
merge changes for storm-1588
Diffstat (limited to 'indra/newview/llslurl.cpp')
-rw-r--r-- | indra/newview/llslurl.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/indra/newview/llslurl.cpp b/indra/newview/llslurl.cpp index 4cf1df1655..a853726dea 100644 --- a/indra/newview/llslurl.cpp +++ b/indra/newview/llslurl.cpp @@ -273,11 +273,11 @@ LLSLURL::LLSLURL(const std::string& slurl) mRegion = LLURI::unescape(path_array[0].asString()); path_array.erase(0); - // parse the x, y, z - if(path_array.size() >= 3) + // parse the x, y, and optionally z + if(path_array.size() >= 2) { - mPosition = LLVector3(path_array); + mPosition = LLVector3(path_array); // this construction handles LLSD without all components (values default to 0.f) if((F32(mPosition[VX]) < 0.f) || (mPosition[VX] > REGION_WIDTH_METERS) || (F32(mPosition[VY]) < 0.f) || |