Commit Graph

10776 Commits (8f892d0f36fda170a5cecf0aea89887d6d0e45ef)

Author SHA1 Message Date
Eli Linden 7b02903633 VWR-17496 en_xui_change; undid bad hardcoded 'ja' width override. 2010-03-08 18:24:42 -08:00
Eli Linden 9c30f64a9c VWR-17484 en_xui_change; undid old 'da' overrides to fix truncation 2010-03-08 18:11:23 -08:00
angela 032762fecf EXT-2418 add price to object tooltip 2010-03-09 10:04:36 +08:00
Eli Linden cd8b53f92d VWR-17483 2010-03-08 17:18:07 -08:00
Eli Linden eaf1ad6908 Merge 2010-03-08 16:57:37 -08:00
Eli Linden 3f40ed4084 ES linguistic changes 2010-03-08 16:56:58 -08:00
Eli Linden 5862f15f9a beta 4 tier1 JA translation, new file 2010-03-08 16:54:16 -08:00
Eli Linden 538286e798 beta 4 tier1 JA translation, new file 2010-03-08 16:54:16 -08:00
Eli Linden 9475064475 beta 4 tier1 JA translation 2010-03-08 16:54:00 -08:00
Eli Linden 57d440f437 beta 4 tier1 JA translation 2010-03-08 16:54:00 -08:00
Eli Linden 29e08b9c3f VWR-17477 en_xui_change 2010-03-08 16:43:26 -08:00
Eli Linden a80883c9f5 VWR-17477 en_xui_change 2010-03-08 16:43:26 -08:00
Eli Linden 4313ace418 WR-17933 en_xui_change; undid 'de' evil overrides. also, more fix for 'en' floater_tools build menu 2010-03-08 16:08:43 -08:00
Eli Linden a0c0d552af WR-17933 en_xui_change; undid 'de' evil overrides. also, more fix for 'en' floater_tools build menu 2010-03-08 16:08:43 -08:00
Monroe Linden c1b29dfcc2 Fix for mac build error
"enumeration value 'MEDIA_EVENT_CLICK_LINK_NOFOLLOW' not handled in switch"
2010-03-08 15:29:28 -08:00
Eli Linden 5123e1c557 EXT-6266 en_xui_change for spinner label widths; undid 'de' local overrides 2010-03-08 15:18:55 -08:00
Monroe Linden b0e6be0737 Fix for mac build error
"enumeration value 'MEDIA_EVENT_CLICK_LINK_NOFOLLOW' not handled in switch"
2010-03-08 15:29:28 -08:00
Eli Linden ab55ab1c8d EXT-6266 en_xui_change for spinner label widths; undid 'de' local overrides 2010-03-08 15:18:55 -08:00
Roxie Linden 8bd5a3bca3 DEV-45976 Last Login Location Preference not remembered 2010-03-08 15:10:27 -08:00
skolb 78abe4f5ff Local merge 2010-03-08 14:54:54 -08:00
skolb 454998e5f2 https://jira.secondlife.com/browse/EXT-5884
Added code to support SLAPPS for Media on a Prim
Reviewed by Monroe and Callum via Code Collab (Review 143).
2010-03-08 14:54:19 -08:00
skolb f39a87ef83 https://jira.secondlife.com/browse/EXT-5884
Added code to support SLAPPS for Media on a Prim
Reviewed by Monroe and Callum via Code Collab (Review 143).
2010-03-08 14:54:19 -08:00
Loren Shih 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
Richard Nelson 6b17727880 EXT-6256 - Viewer 2 - Search field set the focus out of the field when user type 'ne' or 'na' or some other letters combinations
reviewed by Leyla
2010-03-08 12:53:12 -08:00
Eli Linden 9e53fcdc90 Merge 2010-03-08 12:34:06 -08:00
Eli Linden 9d18333a55 VWR-17615 en_xui_change; undoing bad local overrides in fr and es 2010-03-08 12:33:32 -08:00
Richard Nelson 62c4418e52 merge 2010-03-08 12:11:56 -08:00
Richard Nelson aa56bb6274 better fix for spam in LLTextureView
reviewed by Palmer
2010-03-08 12:09:16 -08:00
Nat Goodspeed b513766206 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-03-08 14:24:57 -05:00
Eli Linden 5917029eef Merge 2010-03-08 10:56:55 -08:00
Eli Linden 72c6dc9698 linguistic fixes 2010-03-08 10:54:59 -08:00
Nat Goodspeed 24da622ea8 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-03-08 13:52:46 -05:00
Nat Goodspeed 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
Aimee Linden 34d1d34ca1 Enable auto-posting of SLVoice crash logs to Vivox 2010-03-08 16:40:10 +00:00
Tofu Linden 0e11e774f8 merge 2010-03-08 09:41:50 +00:00
angela 1788f26b4c EXT-2418 Object hover tips no longer show price, description or owner 2010-03-08 16:17:47 +08:00
Xiaohong Bao 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
Xiaohong Bao 6220697f18 Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/ 2010-03-07 21:19:21 -07:00
Xiaohong Bao 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
Tofu Linden 0775e91901 PE merge. 2010-03-07 15:27:17 +00:00
Richard Linden d7b35ee623 changed line endings to Unix 2010-03-05 19:05:36 -08:00
Richard Linden dcf279d663 EXT-2418 added open/sit/buy mouse cursors 2010-03-05 18:34:36 -08:00
Richard Linden 93051dc23c merge 2010-03-05 18:19:50 -08:00
Richard Linden 4ada9e7f15 fix 2010-03-05 18:19:29 -08:00
Monroe Linden 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
Richard Linden 9412447b4f merge 2010-03-05 17:41:02 -08:00
Richard Linden 7cea645ba2 added some logging to help track down crash in EXT-5849 2010-03-05 17:38:21 -08:00
Eli Linden 64b5c53156 Merge 2010-03-05 16:21:45 -08:00
Eli Linden f92a3add59 VWR-17723 2010-03-05 16:07:59 -08:00
Eli Linden 218a60ea9e VWR-17121 en_xui_change 2010-03-05 15:50:09 -08:00