diff options
| author | prep <prep@lindenlab.com> | 2011-09-14 10:41:52 -0400 |
|---|---|---|
| committer | prep <prep@lindenlab.com> | 2011-09-14 10:41:52 -0400 |
| commit | df40eca093b1a238daea9cd23c44f6e39719bf51 (patch) | |
| tree | 205c15512a7fa363ebcea0de8e3ce16a3a58ca38 /indra/newview/llslurl.cpp | |
| parent | 4efca483d7dc8c8a50ebe247c6c163c263ed20f5 (diff) | |
| parent | a250df980b3f37e245d30e51ab65831ae1de0ce0 (diff) | |
merge
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) || |