f49203a383
Automated merge with ssh://hg.lindenlab.com/q/viewer-hotfix
2010-03-09 14:46:07 -05:00
f1a58bd14e
duplicating fix for 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-09 10:47:57 -08:00
ddbc10d03c
fix for EXT-4161: skinny pant legs(have no flare)
2010-03-09 10:18:25 -07:00
5862f15f9a
beta 4 tier1 JA translation, new file
2010-03-08 16:54:16 -08:00
9475064475
beta 4 tier1 JA translation
2010-03-08 16:54:00 -08:00
29e08b9c3f
VWR-17477 en_xui_change
2010-03-08 16:43:26 -08:00
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
5123e1c557
EXT-6266 en_xui_change for spinner label widths; undid 'de' local overrides
2010-03-08 15:18:55 -08:00
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
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
32260e70d0
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-01 18:08:00 -08:00
aac32b2fa3
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
9c8416b34e
VWR-17615 en_xui_change; undoing bad local overrides in fr and es
2010-03-08 12:33:32 -08:00
331d815852
better fix for spam in LLTextureView
...
reviewed by Palmer
2010-03-08 12:09:16 -08:00
9f6e47395c
linguistic fixes
2010-03-08 10:54:59 -08:00
dd5c4cc966
Merge Bao's texture fix and associated changes so we can benefit from speed improvement in Beta 4 (and get QA testing on it early)
2010-03-08 23:00:29 -05:00
34d1d34ca1
Enable auto-posting of SLVoice crash logs to Vivox
2010-03-08 16:40:10 +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
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
931ff555bd
merge
2010-03-05 14:46:00 -08:00
f0ea8083eb
Merge
2010-03-05 14:44:30 -08: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
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
b9a96aaeb3
merge.
2010-03-05 17:53:38 +00:00
a027e1d6e5
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-05 11:55:48 -05:00
efd51b6c02
PE merge.
2010-03-05 16:30:32 +00:00
d33b6a1887
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
2010-03-05 09:15:18 -07:00
2433de3fac
merge
...
--HG--
branch : product-engine
2010-03-05 17:45:59 +02:00
66faaf34c4
Merge from default branch
...
--HG--
branch : product-engine
2010-03-05 17:44:55 +02:00
Nyx (Neal Orman)