Commit Graph

30196 Commits (6db0a2a7ea60df31f4d5deb84f2135bf2ea9f955)

Author SHA1 Message Date
Mnikolenko ProductEngine 1ae4d45337 MAINT-3480 FIXED Duplicated strings are deleted 2013-11-21 15:51:37 +02:00
Mnikolenko ProductEngine 54f29d25a9 MAINT-3471 FIXED Set USER_LOCALE when updating item count. 2013-11-21 12:37:26 +02:00
Jonathan Yap 410a084f9a STORM-1980 Merge changes Oz made (new way of detecting an agent has changed regions)
Modify code to make use of the changed callback
2013-11-19 16:56:17 -05:00
Jonathan Yap dad992ea31 STORM-1980 Minor xml change 2013-11-19 16:17:58 -05:00
Oz Linden fcc885d4fc replace uses of LLEnvManagerNew::setRegionChangeCallback with LLAgent::addRegionChangedCallback 2013-11-19 15:51:27 -05:00
Mnikolenko ProductEngine cf0112d4c6 MAINT-3469 FIXED '\n' is shown in 'Can't divide land' notification instead of new string 2013-11-19 17:37:21 +02:00
Oz Linden a5db4f6c3d add documentation to LLAgent::addRegionChangedCallback and improve logging 2013-11-19 09:28:58 -05:00
Mnikolenko ProductEngine a873a575dd MAINT-3375 FIXED Do not record visibility change if event logging is off(because it kills fps). 2013-11-19 13:36:59 +02:00
Oz Linden 6bd777214c add callbacks to LLAgent for Region and Parcel changes 2013-11-18 19:05:34 -05:00
Monty Brandenberg b2d769534c Code review updates. All comments so far. 2013-11-18 13:33:19 -05:00
Oz Linden ecb2220afd add handler for socket.error to fix OPEN-196 2013-11-18 12:12:31 -05:00
Oz Linden 84a96cdf0f correct attribution for open-195 2013-11-18 11:33:58 -05:00
Jonathan Yap 590630a32f STORM-1980 Code cleanup and an attempt to fix a mac/linux compile error 2013-11-16 10:54:30 -05:00
Jonathan Yap 1e9cfd39c8 STORM-1980 Added a floater displaying a countdown timer.
Removed most of the previous changes.
2013-11-15 11:49:35 -05:00
Oz Linden 54ad1935d3 merge changes for WOLF-444 2013-11-14 18:04:00 -05:00
Ansariel 3358102462 STORM-1984: Mousing over UI elements does not make them light up 2013-11-14 22:13:15 +01:00
Oz Linden a87637119a merge changes for WOLF-444 2013-11-14 15:33:17 -05:00
Oz Linden f8846713ce add open-195 to doc/contributions.txt 2013-11-14 09:16:34 -05:00
Oz Linden 79e38f35b5 merge changes for open-195 2013-11-14 09:12:38 -05:00
Drake Arconis e5b0670ad7 OPEN-195 Cleaned non-UTF8 safe characters 2013-11-13 19:27:17 -05:00
jeremiah@lindenlab.com dd7b0f9615 correct some male/female shape differences 2013-11-13 14:44:46 -05:00
MaximB ProductEngine cad40bee13 MAINT-3364 (Texture picker highlights the wrong texture when no texture is found since CHUI.) 2013-11-13 14:56:14 +02:00
simon cbb2daf879 MAINT-3394 : add localization handler for ProblemAddingEstateBanManager message 2013-11-12 15:54:09 -08:00
simon 7833b28642 MAINT-3397 : add localization handler for EstateManagerFailedllTeleportHome message 2013-11-12 15:41:59 -08:00
Jonathan Yap 8298e5e558 STORM-1980/1983 Merge changes to region restart message format made by Simon
to include region name.
2013-11-12 16:20:41 -05:00
simon ecf211a5dc Merge downstream code from viewer-bear 2013-11-12 11:31:33 -08:00
simon a7381f6e40 Merge viewer-release 2013-11-12 11:22:15 -08:00
Monty Brandenberg d191585a3e Merge. Refresh from viewer-release after 3.6.10 release 2013-11-12 14:06:38 -05:00
maksymsproductengine 241259820c MAINT-3269 FIXED crash in LLMessageSystem::callExceptionFunc 2013-11-12 20:05:45 +02:00
Mnikolenko ProductEngine 44eaa10b80 MAINT-3068 FIXED "Request Teleport" menu item is added to context menu. 2013-11-12 14:51:43 +02:00
Richard Linden 3661748a2c Automated merge with http://bitbucket.org/lindenlab/viewer-lion 2013-11-11 18:41:52 -08:00
Richard Linden 89d5d01c41 MAINT-3432 FIX Help -> Report Bug should open jira with pre-populated fields
moved viewer information strings into LLAppViewer
replaced Help>Report a Bug with direct use of Jira link
2013-11-11 18:41:25 -08:00
Graham Linden 10705b4360 Merge 3.6.11 for RC-ability 2013-11-11 15:50:01 -08:00
maksymsproductengine 742d866265 convert dos line endings 2013-11-12 01:16:30 +02:00
maksymsproductengine 542aa66a0c convert dos line endings 2013-11-12 01:08:04 +02:00
Graham Madarasz (Graham Linden) 4be5d07acb MAINT-3429 remove GeForce hack which is causing issues with auto-alpha masks in deferred 2013-11-11 14:06:33 -08:00
Oz Linden d1b4c5bf73 merge changes for 3.6.10-release 2013-11-11 16:40:22 -05:00
Oz Linden 3c2b90514d merge 3.6.10-release 2013-11-11 16:19:35 -05:00
Oz Linden ebc9bcbf69 convert dos line endings 2013-11-11 15:26:55 -05:00
Oz Linden b8cafb8e85 increment viewer version to 3.6.11 2013-11-11 15:26:19 -05:00
Oz Linden 424e8687e4 Added tag 3.6.10-release for changeset 5b54b36862ff 2013-11-11 15:25:46 -05:00
Jonathan Yap 3e429c1e11 STORM-1980/1983 Small XML cleanup.
Changed notification type to Alert.
Addes seconds field to notification message.
2013-11-08 16:15:36 -05:00
Graham Madarasz (Graham Linden) 19b2655a48 MAINT-3155 redux moved reg for URL event handling to WillFinishLaunching instead of DidFinishLaunching while laughing at Apple 2013-11-08 10:11:22 -08:00
Graham Linden 66b6bffca9 MAINT-3412 Fix Intel Iris recognizer to include optional Pro as is reported with integrated-only graphics on new MBP 2013-11-08 09:39:24 -08:00
Mnikolenko ProductEngine a8e74f20ba MAINT-3400 FIXED Reshape IMSession floater after expanding participant list. 2013-11-08 12:32:36 +02:00
Dave Parks 9ad67587b7 DRTVWR-338 Make an inocuous change to get a new build number out of TeamCity 2013-11-07 16:18:17 -06:00
Jonathan Yap 662efccfb8 STORM-1980/1983 Add debug setting UISndRestart and value. This UUID will need to
be replaced with an official UUID once one has been established.
2013-11-06 15:11:11 -05:00
jeremiah@lindenlab.com b8f1e2a770 updated avatar files 2013-11-06 11:30:39 -05:00
Mnikolenko ProductEngine aaf6c7954d MAINT-3374 FIXED Don't show username after display name if this setting is disabled. 2013-11-06 11:42:48 +02:00
Jonathan Yap 21ff4de026 STORM-1980/1983 Revert previous change 2013-11-05 17:57:56 -05:00