diff options
| author | Richard Nelson <richard@lindenlab.com> | 2011-08-31 11:51:38 -0700 |
|---|---|---|
| committer | Richard Nelson <richard@lindenlab.com> | 2011-08-31 11:51:38 -0700 |
| commit | 2154bccdc4ef79bc2d593daad85d1344e9177bcf (patch) | |
| tree | df202d7f19616648be5680ff145fd281c5d21f69 /indra/newview/llslurl.cpp | |
| parent | e62a4d4ec151e81f4dc68b29a009596d3d154d57 (diff) | |
| parent | 09394d3a9d72c701fe28c54d7c76d71ddf3ef765 (diff) | |
Automated merge with http://hg.secondlife.com/viewer-development
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) || |