Commit Graph

23560 Commits (667e5d196817dffa7eb68ec53dd02ac7a66d0ea2)

Author SHA1 Message Date
Dave Parks 667e5d1968 Merge cleanup 2012-06-22 14:59:40 -05:00
Dave Parks 9e9d32de38 merge 2012-06-22 14:04:33 -05:00
Oz Linden 3c276c87bd merge back 3.3.3-release tag 2012-06-21 19:38:15 -04:00
Oz Linden 4397516ca5 merge changes for DRTVWR-168 2012-06-21 17:50:41 -04:00
Oz Linden b10df0b6c4 tag merge of DRTVWR-168 2012-06-21 17:50:03 -04:00
Oz Linden 90547ff411 Added tag 3.3.3-release for changeset 6428242e124b 2012-06-21 16:44:04 -04:00
Oz Linden f64a79d9d1 merge changes for DRTVWR-171 2012-06-21 14:19:25 -04:00
Oz Linden 4539e5c8e9 tag merge of DRTVWR-171 2012-06-21 14:19:04 -04:00
Oz Linden 5dceb6b06c STORM-1889: require all fields when importing spelling dictionary 2012-06-20 21:52:42 -04:00
Kitty Barnett 8ef14ffb29 STORM-1887 FIXED Added words are not saved in dictionaries if main dictionary was reselected
The user's custom dictionary and ignore list are now independent of the primary dictionary.
2012-06-19 21:48:45 +02:00
Oz Linden ee130adc60 pull back tags for 3.3.3-beta3 2012-06-18 22:18:41 -04:00
Oz Linden 1d23a8600c Added tag 3.3.3-beta3 for changeset 4b3c68199a86 2012-06-18 22:15:33 -04:00
Oz Linden 0ac87c8768 merge changes for DRTVWR-169 2012-06-18 22:14:12 -04:00
Oz Linden ba01c76e1f tag merge of DRTVWR-169 2012-06-18 22:12:15 -04:00
Nat Goodspeed 84536935eb MAINT-1144: Update with relevant apr_suite fix. 2012-06-18 16:14:30 -04:00
Nat Goodspeed 667ca78b49 MAINT-1144: Update to apr_suite containing relevant fix. 2012-06-18 12:57:55 -04:00
Oz Linden 185db4ad38 switch to (identical) library builds from lindenlab repositories 2012-06-16 08:42:13 -04:00
Oz Linden 10275e9bb1 corrected build problem detected on Mac 2012-06-15 17:40:07 -04:00
Kitty Barnett f15fc05fd2 STORM-276 Ease-of-use importing of Open Office dictionary extensions 2012-06-15 20:47:02 +02:00
Oz Linden 3f7ed8b888 STORM-1883: add alert when a secondary dictionary is imported 2012-06-15 12:36:03 -04:00
Kitty Barnett bdb0f4f485 STORM-276 FIXED Main dictionary combobox in spell check settings floater doesn't sort dictionaries by name 2012-06-15 17:11:58 +02:00
Oz Linden c3cb28ec67 minor cosmetic changes to spelling floater 2012-06-15 09:16:49 -04:00
Oz Linden 6c0922df91 add to contributions.txt 2012-06-15 08:39:11 -04:00
Oz Linden 02f0f87f95 STORM-1880: copy imported dictionary files rather than moving them 2012-06-14 21:21:42 -04:00
Oz Linden c8f21753fa STORM-1881: close dictionary import dialog if parent spell checking prefs dialog is closed 2012-06-14 20:18:16 -04:00
Oz Linden fc1f30a05b STORM-1882: keep dictionary selected when moving, allowing deletion when moved to Available 2012-06-14 19:51:59 -04:00
Todd Stinson dee2887b20 EXP-1953: Updating the response message sent to the Inviter in Scenario 3. 2012-06-14 11:32:25 -07:00
Todd Stinson e41dde44f0 EXP-1959: Marking the teleport entry access notifications as unique so they do not stack. 2012-06-13 18:15:54 -07:00
Todd Stinson d42d78a58a EXP-1941: Backed out changeset: 2f6546ac7e5e 2012-06-12 18:27:05 -07:00
Todd Stinson 5a76b1dc2f EXP-1953: Updating copy after Leo creating the final copy in the jira. 2012-06-12 17:29:03 -07:00
Todd Stinson 32063b5999 EXP-1953: Altering the behavior of building an LLTextBase such that icons are appended in place rather than prepended out of context. 2012-06-12 16:58:59 -07:00
Oz Linden 64a34c1370 minor ui tweaks from review 2012-06-12 06:50:22 -04:00
Oz Linden eb227e4dbc merge spelling changes for UI review 2012-06-11 16:15:31 -04:00
Oz Linden 7c77c76fc7 merge fixes for http tests 2012-06-11 14:59:22 -04:00
Todd Stinson 10967ef859 Correcting an incorrectly named notification. 2012-06-11 11:46:01 -07:00
Kitty Barnett d96d3d5256 STORM-276 Added the ability to remove (user-installed) dictionaries 2012-06-11 17:37:06 +02:00
Kitty Barnett 45b00642aa STORM-276 Ignore any files in the app_settings/dictionaries folder 2012-06-11 17:23:46 +02:00
Kitty Barnett 53bd3ada86 STORM-276 Distinguish between default dictionaries and user-installed dictionaries 2012-06-11 16:04:24 +02:00
Oz Linden 1acae5b291 fix error notices to be more prominent for invalid list names and keywords 2012-06-11 08:21:39 -04:00
Kitty Barnett 80b1a2c0a8 STORM-276 Insert braces around if/for/while loops 2012-06-11 13:39:45 +02:00
Oz Linden fa1214914d merge changes for DRTVWR-165 2012-06-09 08:20:49 -04:00
Oz Linden c931c74fdb Added tag 3.3.3-beta2 for changeset fdcc08a4f20a 2012-06-09 08:19:14 -04:00
Oz Linden 9ee115f5e5 tag merge of DRTVWR-165 2012-06-09 07:06:38 -04:00
Todd Stinson 1e23bfb75c Pull and merge a single changeset from http://hg.lindenlab.com/nat/viewer-maint-1144/ to resolve build issues. 2012-06-08 19:15:50 -07:00
Todd Stinson b73563f9fa EXP-1953: Ensuring to send the IM_LURE_DECLINED message back to the inviter. 2012-06-08 19:13:26 -07:00
Todd Stinson 047ff479b7 EXP-1953: Sending an automated IM back to the user who offered the teleport lure informing the inviter that the guest cannot access the region because of their maturity level. 2012-06-08 19:05:33 -07:00
Todd Stinson 68c3d1bb2e EXP-1953: First pass at implementing the maturity flow during a teleport via lure. 2012-06-08 18:28:19 -07:00
Oz Linden 19a4a5fc66 merge changes for tags in viewer-beta repo 2012-06-08 16:55:44 -04:00
Brad Payne (Vir Linden) 9f000e4b34 SH-3153 FIX 2012-06-08 15:49:11 -04:00
Oz Linden f363292a84 merge changes to fix http tests 2012-06-08 15:33:36 -04:00