2aa9ecb602
EXT-5867 : Crash when clicking and dragging root folder of object contents into build floater
...
Simple fix to use dynamic cast - the previous unsafe static cast was treating folders as if they were items and then querying permissions, which don't exist for folders.
This code actually existed back in 1.23 but by some stroke of luck worked.
2010-03-08 17:38:50 -05:00
9e53fcdc90
Merge
2010-03-08 12:34:06 -08:00
9d18333a55
VWR-17615 en_xui_change; undoing bad local overrides in fr and es
2010-03-08 12:33:32 -08:00
62c4418e52
merge
2010-03-08 12:11:56 -08:00
aa56bb6274
better fix for spam in LLTextureView
...
reviewed by Palmer
2010-03-08 12:09:16 -08:00
b513766206
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-08 14:24:57 -05:00
5917029eef
Merge
2010-03-08 10:56:55 -08:00
72c6dc9698
linguistic fixes
2010-03-08 10:54:59 -08:00
24da622ea8
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-08 13:52:46 -05:00
dcfc28890b
Fix breaking indra/test/llpermissions_tut.cpp tests.
...
Certain tests of allowModifyBy(), allowCopyBy() and allowMoveBy() were
computing a bit-shifted S32 value and testing that the method return value
matched that specific bit. Whoever originally coded the test probably started
with allowModifyBy() == TRUE, but observed that it didn't work. Instead of
just testing for nonzero, in the spirit of BOOL, he then determined the
specific BOOL value (typedef for 'int') returned by each test so he could
still compare for equality. In other words, the tests were far too
knowledgeable about the method implementation. At some point these methods
were changed to return C++ standard 'bool' instead, so the internal
bit-masking operations got mapped to 'true' and 'false' anyway, making it
impossible for the original equality comparison to succeed. Fix tests
accordingly.
Use ensure_equals("msg", expr1, expr2) instead of ensure("msg", expr1 == expr2).
On failure, the former will report the actual mismatched values.
Remove other extraneous Microsoft-style "BOOL" usage (e.g. expr == TRUE).
2010-03-08 13:50:44 -05:00
0e11e774f8
merge
2010-03-08 09:41:50 +00:00
3ee48a2090
trival fix to eliminate unnecessary warnings "LLView::~LLView(): Deleting view " << mName << " during UI draw() phase" caused in lltextureview.cpp (from the texture console).
2010-03-07 22:55:52 -07:00
6220697f18
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-07 21:19:21 -07:00
6a8b63e9de
partial fix for EXT-5711: Some textures loading from cache seems jammed.
...
This fix should be able to improve the speed of loading texturs from cache noticeably (30% or more). More fix to come.
2010-03-07 21:18:10 -07:00
0775e91901
PE merge.
2010-03-07 15:27:17 +00:00
93051dc23c
merge
2010-03-05 18:19:50 -08:00
4ada9e7f15
fix
2010-03-05 18:19:29 -08:00
eee50d1401
Fix for a crash on startup/shutdown introduced in the tip of viewer-2-0 very recently.
...
list.erase(list.find()) is not safe, because erasing list.end() is undefined. Check to make sure the find succeeded before doing the erase.
Reviewed by Richard at http://codereview.lindenlab.com/341001
2010-03-05 18:11:55 -08:00
9412447b4f
merge
2010-03-05 17:41:02 -08:00
7cea645ba2
added some logging to help track down crash in EXT-5849
2010-03-05 17:38:21 -08:00
64b5c53156
Merge
2010-03-05 16:21:45 -08:00
f92a3add59
VWR-17723
2010-03-05 16:07:59 -08:00
218a60ea9e
VWR-17121 en_xui_change
2010-03-05 15:50:09 -08:00
a3fa96ff0e
merge
2010-03-05 15:41:37 -08:00
27919e106a
fix for merge
2010-03-05 15:41:15 -08:00
90e7506cae
VWR-17116 en_xui_change
2010-03-05 15:32:50 -08:00
f499260782
Implemented (EXT-4715) Add maturity icons to Classifieds - create and details.
...
--HG--
branch : product-engine
2010-03-06 01:17:34 +02:00
c4c3e6bedd
Fixed major bug (EXT-6033) Parcel, Region,and Estate areas of 'PlaceProfile' are corrupted.
...
- Added height attribute value to accordion tabs.
--HG--
branch : product-engine
2010-03-06 01:16:56 +02:00
bf265a25fc
(EXT-4705) Show maturity icon on Region/Estate tab
...
- Added items names to match localized XUI.
--HG--
branch : product-engine
2010-03-06 01:14:33 +02:00
931ff555bd
merge
2010-03-05 14:46:00 -08:00
f0ea8083eb
Merge
2010-03-05 14:44:30 -08:00
24810564a3
Fixed linux build
...
--HG--
branch : product-engine
2010-03-06 00:22:46 +02:00
8ae52e2b90
Partially implemented nice-to have sub-task EXT-4706 (Add maturity icons to About Land).
...
- Added maturity icons to General and Covenant tabs.
--HG--
branch : product-engine
2010-03-06 00:17:16 +02:00
a714e9ed7e
VWR-17558 en_xui_change
2010-03-05 14:07:11 -08:00
ae66c372ec
VWR-17687 en_xui_change
2010-03-05 13:53:20 -08:00
eee6b1c779
VWR-17686
2010-03-05 13:45:06 -08:00
f22423fb29
VWR-17362
2010-03-05 13:34:40 -08:00
18687a3652
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-05 16:31:29 -05:00
65ecde210e
Fix Mac llmediaplugintest build breakage.
...
A viewport array passed to glGetIntegerv() and gluUnProject() was declared as
'int'. This compiles on Windows, but fails on Mac. Declaring as 'GLint' works.
2010-03-05 16:29:37 -05:00
b70951ca1e
merge
2010-03-05 13:11:26 -08:00
dd663449b6
Only comments added to crash reporting code on handling old crash logs on mac. No code changed :)
2010-03-05 13:07:32 -08:00
870dcca787
Working on major bug EXT-4820([NUX] Viewer dimensions on first-run) - implemented LLWindowMacOSX::maximize() method
...
--HG--
branch : product-engine
2010-03-05 21:36:41 +02:00
92025836ed
Working on major bug EXT-4820([NUX] Viewer dimensions on first-run) - implemented LLWindowSDL::maximize() method
...
--HG--
branch : product-engine
2010-03-05 21:36:41 +02:00
48fd4c8d14
Working on major bug EXT-4820([NUX] Viewer dimensions on first-run) - moved LLDisplayInfo to llwindow, implemented getting the width/height of screen for mac os and linux.
...
--HG--
branch : product-engine
2010-03-05 21:36:41 +02:00
32aa06139e
EXT-5698 undo local FR override (not good practice); fix EN instead for consistency, and to allow for ES longer translation of "Buy" (Erica changed "Buy L$" to "Buy" to mitigate the problem)
2010-03-05 11:34:24 -08:00
5eb5602220
Merge
2010-03-05 11:08:30 -08:00
8e4aa522b2
beta 4 JA linguistic
2010-03-05 10:53:28 -08:00
a174a4ff3d
merge
...
--HG--
branch : product-engine
2010-03-05 20:13:52 +02:00
b9a96aaeb3
merge.
2010-03-05 17:53:38 +00:00
b60274fad4
WIP on EXT-5687 (Classifieds are missing the clickthrough data).
...
Updating classieifed click stats when user presses "Teleport" or "Map" button in the picks/classifieds list side panel.
--HG--
branch : product-engine
2010-03-05 19:30:31 +02:00
Loren Shih