Commit Graph

13771 Commits (2e46db239fc8587ecb5aafceda2f060fd470cd93)

Author SHA1 Message Date
Merov Linden 2e46db239f Pull from viewer-beta 2010-11-24 13:57:22 -08:00
Merov Linden d9e2d4de48 STORM-667 : pull to viewer-beta 2010-11-24 13:47:35 -08:00
Seth ProductEngine fa24e07065 STORM-667 FIXED Default name tag color changed to white to increase contrast with default dark background. 2010-11-24 22:30:36 +02:00
eli_linden f2194ee5f6 STORM-531 FIX Danish translation 2010-11-24 11:22:57 -08:00
Leyla Farazha 82f3a34e17 Merge 2010-11-24 10:28:41 -08:00
Leyla Farazha d18e4c6884 DN-207: "Investigate why "unknown" is appearing in My Friends list" 2010-11-24 10:26:21 -08:00
Andrew Productengine 46d1323f49 STORM-671 FIXED Renamed "Move & View" panel to avoid name duplication. 2010-11-24 18:32:28 +02:00
Merov Linden a918181910 STORM-670 : merges fixes for CHOP-220 and CHOP-221 2010-11-24 12:56:40 -08:00
Merov Linden d7d23d1624 Merge viewer-development 2010-11-24 00:51:28 -08:00
Merov Linden 744d23e314 Merge from lindenlab/viewer-beta 2010-11-24 00:49:33 -08:00
eli_linden d8b426ee31 STORM-531 WIP temp fix, pending Danish translation 2010-11-23 18:51:26 -08:00
eli_linden f2cb59b295 CT-633 FIX DA translation (new file) for set19, for Viewer 2.4 2010-11-23 17:02:36 -08:00
eli_linden 4952afae64 CT-633 FIX DA translation for set19, for Viewer 2.4 2010-11-23 17:02:21 -08:00
Leyla Farazha f3705df982 (DN-211) Conference call dialog shows Conference with ??? (???) in title header with view display names on and off
Inbox
X
2010-11-23 16:03:27 -08:00
Wolfpup Lowenhar 379c385877 STORM-102: this is to correct a minor issue with ad-hoc conferences so that they do not
get date stamped at all since each one is defined as a unique conversation.
2010-11-23 17:32:00 -05:00
Andrew A. de Laix 5c70975179 [mq]: thread_state_fix 2010-11-23 11:40:54 -08:00
Leyla Farazha 739e4ac541 DN-212 [crashhunters] LLCacheName::buildLegacyName 2010-11-23 11:25:40 -08:00
Leyla Farazha 5b80dbff3a DN-211 Conference call dialog shows Conference with ??? (???) in title header with view display names on and off 2010-11-23 11:21:59 -08:00
brad kittenbrink 7233506624 Minor improvement to CHOP-220 unit test. 2010-11-22 19:51:47 -08:00
brad kittenbrink 7db4d2b88f Fix for CHOP-220. Reviewed by mani. 2010-11-22 19:07:17 -08:00
brad kittenbrink 023af775d5 Added failing unit test which I believe should exercise CHOP-220 crash. 2010-11-22 19:06:49 -08:00
Andrew Productengine 44a6e5da2c STORM-521 FIXED Made defensive fix for crash in LLAudioSource::hasPendingPreloads().
Couldn't reproduce the crash, but made defensive fix. Added check for NULL into for loop that iterates through mPreloadMap in LLAudioSource::hasPendingPreloads(). Such check is already present in similar situation in LLAudioEngine::startNextTransfer().
2010-11-22 17:26:39 +02:00
Oz Linden 02701073ce increment viewer version number to 2.5 2010-11-22 09:53:01 -05:00
Vadim ProductEngine 2e47e4f303 Moved some public LLSideTray methods to protected section. 2010-11-22 16:10:58 +02:00
Vadim ProductEngine 90f496b302 STORM-461 FIXED Hide sidebar tab buttons in mouselook mode. 2010-11-22 16:09:33 +02:00
Wolfpup Lowenhar abf406e3d5 STORM-674: corrected duplicate name tags in pannel_preferences_color.xml 2010-11-23 20:55:18 -05:00
Kent Quirk 93a8da6c22 tag for 2.4 first beta 2010-11-21 20:48:03 -05:00
brad kittenbrink ef07a4b239 Merge 2010-11-19 17:47:31 -08:00
brad kittenbrink 870773ec17 Fix for viewer_manifest.py failure on windows. 2010-11-19 17:44:59 -08:00
Leyla Farazha 7e8929ad53 Merge 2010-11-19 16:14:15 -08:00
Leyla Farazha 7a74f64d5e Merge 2010-11-19 16:13:51 -08:00
Leyla Farazha b48dad1726 DN-199 Modify LLGetDisplayName tooltip 2010-11-19 16:12:26 -08:00
Bill Curtis d92608f1dc Automated merge with http://bitbucket.org/lindenlab/viewer-development 2010-11-19 15:58:35 -08:00
brad kittenbrink 9d3174c038 Merge. 2010-11-19 15:54:42 -08:00
brad kittenbrink a062c73ff4 Fix for windows installer missing update_install.bat. Paired with mani. 2010-11-19 15:54:03 -08:00
brad kittenbrink fd78866bcd Merged latest lindenlab/viewer-development with mani_linden/viewer-development 2010-11-19 15:40:05 -08:00
Mark Palange (Mani) 0778bf9152 Updated execute permissions on linux install script 2010-11-19 14:33:09 -08:00
Bill Curtis 066d8c39ca Automated merge with file:///Users/Bill/Projects/viewer-release 2010-11-19 14:11:42 -08:00
Oz Linden 3337ef16ce Automated merge with file:///Users/oz/Work/viewer-development 2010-11-19 17:03:05 -05:00
Bill Curtis cb8b30864f fixed typo 2010-11-19 14:01:30 -08:00
Nat Goodspeed 8b079f38c6 Automated merge with https://bitbucket.org/mani_linden/viewer-development 2010-11-19 17:00:27 -05:00
Nat Goodspeed b9d9a84f74 Fix test failure due to erroneous validation of fputs() return value. 2010-11-19 16:59:28 -05:00
Dave SIMmONs 2eec4949cc Merge latest from lindenlab/viewer-development 2010-11-19 13:22:07 -08:00
Oz Linden f6ba55b8ed merge fix for STORM-138 2010-11-19 15:58:53 -05:00
Oz Linden 0f72f152e8 merge fix for STORM-616 2010-11-19 15:52:52 -05:00
Oz Linden 1630bd4149 merge fix for STORM-560 2010-11-19 15:51:12 -05:00
Oz Linden bf5e9b8374 merge fix for STORM-584 2010-11-19 15:50:07 -05:00
Oz Linden 025db4bab7 merge additional fixes for STORM-572 2010-11-19 15:44:32 -05:00
Oz Linden 7f48809a74 merge fix for STORM-189 2010-11-19 15:40:42 -05:00
Jonathan Yap daae74e569 Changed Sit Down shortcut definition and reordered menu slightly. 2010-11-19 15:35:24 -05:00