diff options
| author | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 16:07:18 -0800 |
|---|---|---|
| committer | Tofu Linden <tofu.linden@lindenlab.com> | 2010-01-20 16:07:18 -0800 |
| commit | b96e52b72ab598a57d981c850b5f14b1ac406325 (patch) | |
| tree | f83f288219bb38bb442aa0c0c479309b93d7469c | |
| parent | f4b2de0d058d691afbb45315604c39dc05686586 (diff) | |
| parent | 692920768589224e852ed2f9dea0c38abf1d1e57 (diff) | |
Merge.
| -rw-r--r-- | indra/llrender/llimagegl.cpp | 15 | ||||
| -rw-r--r-- | indra/newview/skins/default/xui/en/floater_media_browser.xml | 2 | ||||
| -rw-r--r-- | install.xml | 8 |
3 files changed, 19 insertions, 6 deletions
diff --git a/indra/llrender/llimagegl.cpp b/indra/llrender/llimagegl.cpp index d873005fd9..cd493481d5 100644 --- a/indra/llrender/llimagegl.cpp +++ b/indra/llrender/llimagegl.cpp @@ -1736,12 +1736,25 @@ BOOL LLImageGL::getMask(const LLVector2 &tc) if (u < 0.f || u > 1.f || v < 0.f || v > 1.f) { - llerrs << "WTF?" << llendl; + LL_WARNS_ONCE("render") << "Ugh, u/v out of range in image mask pick" << LL_ENDL; + u = v = 0.f; + llassert(false); } S32 x = (S32)(u * width); S32 y = (S32)(v * height); + if (x >= width) + { + LL_WARNS_ONCE("render") << "Ooh, width overrun on pick mask read, that coulda been bad." << LL_ENDL; + x = llmax(0, width-1); + } + if (y >= height) + { + LL_WARNS_ONCE("render") << "Ooh, height overrun on pick mask read, that woulda been bad." << LL_ENDL; + y = llmax(0, height-1); + } + S32 idx = y*width+x; S32 offset = idx%8; diff --git a/indra/newview/skins/default/xui/en/floater_media_browser.xml b/indra/newview/skins/default/xui/en/floater_media_browser.xml index 4b280ac59f..70dac7e41c 100644 --- a/indra/newview/skins/default/xui/en/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/en/floater_media_browser.xml @@ -80,7 +80,7 @@ height="20" layout="topleft" left_pad="5" - max_chars="255" + max_chars="1024" name="address" top_delta="0" width="540"> diff --git a/install.xml b/install.xml index b9abfb782c..91276ca498 100644 --- a/install.xml +++ b/install.xml @@ -1014,9 +1014,9 @@ anguage Infrstructure (CLI) international standard</string> <key>darwin</key> <map> <key>md5sum</key> - <string>2eb58f544c0d912aa382de2c947be7f1</string> + <string>d97d843704514ae1b5f153fab2931920</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6-darwin-20100104.tar.bz2</uri> + <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-4.6-darwin-20100120.tar.bz2</uri> </map> <key>linux</key> <map> @@ -1028,9 +1028,9 @@ anguage Infrstructure (CLI) international standard</string> <key>windows</key> <map> <key>md5sum</key> - <string>c41be1ba9728555ae5a2d2151c96dfe1</string> + <string>18c1a4059bad1504a457e70c8c218033</string> <key>url</key> - <uri>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/llqtwebkit-windows-qt4.6-20100115.tar.bz2</uri> + <uri>http://viewer-source-downloads.s3.amazonaws.com/install_pkgs/llqtwebkit-windows-qt4.6-20100120.tar.bz2</uri> </map> </map> </map> |