e07d6bc4f1
Merge viewer-neko
2017-07-18 21:37:09 +02:00
f7186ac260
Contributors list fix: NickyD and Nicky Dasmijn are the same person
2017-07-11 20:46:53 +03:00
5d812b95e8
MAINT-7581 [contribution] Closing the 'Replace links' floater crashes the viewer if a replace is in progress
2017-07-11 14:54:29 +03:00
b0d8f3a1ab
MAINT-4532: properly detect Windows 10 in the 64bit build (only - 32bit runs in Windows 8 compatibility mode)
2017-07-10 16:30:28 -04:00
530f69ff33
MAINT-7541 Not able to save login credentials on clean install
2017-07-10 17:22:12 +03:00
5478f2a223
MAINT-7581 [contribution] Closing the 'Replace links' floater crashes the viewer if a replace is in progress
2017-07-11 14:54:29 +03:00
d2b93c74f9
Merge Firestorm LGPL
2017-06-20 23:07:41 +02:00
270cd8ff15
Merged in lindenlab/viewer-release
2017-06-20 23:16:03 +03:00
5d84299cee
Merge Firestorm LGPL
2017-06-19 21:23:53 +02:00
2347b25808
Merge viewer-neko
2017-06-09 11:49:10 +02:00
d7edeb2df8
STORM-2149: Add a warning notification when deleting a folder of filtered content
2017-06-02 16:44:00 +02:00
5205be0c65
STORM-2148 Crash on trying to save texture file(s) to computer from inventory
2017-05-31 19:28:46 +03:00
cebd833609
STORM-2148 Crash on trying to save texture file(s) to computer from inventory
2017-05-31 19:28:46 +03:00
97cea29fac
Sync contributions.txt with upstream
2017-06-09 09:39:15 +02:00
a8d3d16809
Merge Firestorm LGPL
2017-05-22 22:45:47 +02:00
806fd24704
merge
2017-05-22 21:09:07 +01:00
f1cb7185f7
Merge asset-http
2017-05-07 16:10:30 +02:00
dcac0dce59
Merge viewer-bear
2017-05-07 13:11:50 +02:00
ed9653f711
MAINT-7343 - contributions.txt update
2017-05-01 15:17:28 -04:00
d4d56f004a
MAINT-7074 Fixed ability to escape from skin directory with <icon>
2017-04-19 21:19:04 +03:00
b59ac959fc
MAINT-6519 Contribution, adds feature to replace inventory links
2017-04-27 19:19:11 +02:00
5c4ae5b11a
STORM-2145 Camera Presets -- some initial work
2017-02-23 17:50:36 -05:00
dd69a22834
Merge viewer-bear
2017-01-27 09:42:51 +01:00
e3d5861aa0
Merge viewer-lynx
2017-01-25 11:12:16 +01:00
5d7c5ea4d2
MAINT-7059 [contribution] Import of custom spellcheck dictionary fails silently
2017-01-18 12:20:55 +02:00
6b59d55230
MAINT-7028 Fixes scrambling of Outfit Order in Appearance Panel
2017-01-06 01:25:15 +02:00
e4497dcb87
Merge viewer-lynx
2017-01-02 12:24:50 +01:00
946b28ad76
Merged STORM-2142
2016-12-19 19:18:53 +02:00
645301633f
STORM-2144 - Guard against null pointers when LLPanelOutfitEdit gets called before postBuild() on login.
2016-12-15 09:34:04 -06:00
a6cda1ee06
STORM-2144 - Guard against null pointers when LLPanelOutfitEdit gets called before postBuild() on login.
2016-12-15 09:34:04 -06:00
1e292b4735
Backed out changeset: 7b22662b83b2 - This stays in and has nothing to do with mesh LOD calculation
2016-12-15 09:48:09 +01:00
31be233b66
Merge viewer-lynx
2016-12-15 09:46:35 +01:00
7dcea20c4d
Backed out changeset: b1a30962dd54
2016-12-15 02:41:39 +02:00
8c083cf771
Merge Firestorm LGPL
2016-12-05 22:40:59 +01:00
2abd0eef41
Merged in lindenlab/viewer-release
...
DRTVWR-412 Bento (avatar skeleton extensions)
2016-12-05 21:51:29 +02:00
e2919977d6
Merge viewer-lynx
2016-11-30 11:15:04 +01:00
aa25acc045
Merge Firestorm LGPL
2016-11-30 09:43:52 +01:00
56c718681a
Merge Firestorm LGPL
2016-11-21 10:08:02 +01:00
fb9cb88272
STORM-2143 Correct vertex winding of stars
2016-11-19 22:25:39 -05:00
07bb7bc846
STORM-2143 Correct vertex winding of stars
2016-11-19 22:25:39 -05:00
76b3efe01c
MAINT-6953 [Contribution] Error in DPI scaling calculation
2016-11-19 11:19:01 +00:00
fb0355fdba
Merged in Ansariel/storm-2141
2016-11-21 21:18:13 +02:00
ec5051699a
STORM-2142 Tweaks to some of the 4 combined issues
2016-11-16 11:21:54 -05:00
5a58635b64
Merge Firestorm LGPL
2016-11-16 16:11:56 +01:00
84222286cc
MAINT-6917 Setting one avatar to "Do not render" causes all avatars to become imposters
2017-11-09 23:05:35 +02:00
d31596db6a
merge
2016-11-16 08:39:41 -05:00
6afe3d7f05
Update contributions.txt
2016-11-16 11:33:23 +01:00
c182741596
Merge viewer-lynx
2016-11-16 09:55:54 +01:00
420b1c9429
STORM-2141: Fix various inventory floater related issues:
...
* Opening new inventory via Control-Shift-I shortcut uses legacy and potentinally dangerous code path
* Closing new inventory windows don't release memory
* During shutdown legacy and inoperable code for inventory window cleanup is called
* Remove old and unused inventory legacy code
2016-11-14 14:45:53 +01:00
18dfdc2ae0
Merge bento-box
2016-11-11 16:00:37 +01:00
5fb30e5ad3
MAINT-6913 - (Via Sovereign Engineer and Shyotl Kuhr) Pack the skinned matrix and translation into a single mat3x4 for optimal data transfer to reduce uniform slot usage.
2016-11-11 09:37:45 -05:00
b6e7708d60
MAINT-6912 Specifying physics mesh was resetting previous model name
2016-11-10 12:51:06 +02:00
5921cc9d8a
MAINT-6917 Setting one avatar to "Do not render" causes all avatars to become imposters
2016-11-09 14:20:46 +02:00
a433c05bb0
MAINT-6911 Fixes viewer crash after using "Clear settings & reset form"
2016-11-07 21:03:05 +02:00
6083fd1cbe
STORM-2140 LLLineEditor enabled-state cannot properly set via XUI
2016-11-07 12:33:14 +02:00
28c9002e98
MAINT-6906 Editing landmark name removes the land mark coordinates
2016-11-04 15:20:01 +02:00
0d0d9c4e23
Merge viewer-bear
2016-11-04 14:02:34 +01:00
97c372047c
Merged in lindenlab/viewer-bear
2016-10-27 21:10:46 +03:00
3b1e19d23e
Backed out changeset: 5816c800a9c1
...
Prervious MAINT-2141 fix causes MAINT-6791 so reverted it
2016-10-26 02:31:16 +03:00
3b328a3880
MAINT-6929 [Contribution] E-mail links are not parsed correctly when top level domain is over 6 characters.
2016-11-15 13:00:47 +02:00
92f6d8d521
Merge viewer-bear
2016-10-01 17:03:57 +02:00
f5f4b771f1
Merged in lindenlab/viewer-bear
2016-09-30 17:44:38 +03:00
70a82ac3df
MAINT-6773 Add payment message
2016-09-28 12:35:34 +03:00
7a7dc795f6
MAINT-6744 'System UI size factor has changed... ' shouldn't appear after installation
2016-09-26 00:58:25 +03:00
741194085a
MAINT-6752 Updated contributions.txt
2016-09-23 00:50:16 +03:00
6e5b38f92d
Merge Firestorm LGPL
2016-09-14 23:23:12 +02:00
e18d32ee13
Merge viewer-bear
2016-09-12 20:58:57 +02:00
eb20aefd07
Merge Firestorm LGPL
2016-09-12 20:23:20 +02:00
d6b0db5118
MAINT-6665 [Contribution] Viewer crashes when setting a local texture from a path containing non-standard characters
2016-08-26 17:02:32 +03:00
ca9d39c6c7
SL-3404 Don't send ParcelPropertiesRequest on every cursor position change
2016-08-25 13:42:37 -05:00
c4e9fe9fe5
MAINT-6636 Mesh upload was failing from a folder with a diacritic character in the name
2016-08-25 15:40:33 +03:00
a079baa258
STORM-2136 - Don't send ParcelPropertiesRequest willy nilly on every cursor position change, only send when ShowLandTooltips is enabled
2016-08-25 13:42:37 -05:00
4da402dd23
Merge viewer-bear
2016-08-21 12:39:18 +02:00
d85bc7de7f
MAINT-6637 DebugAvatarAppearanceMessage incorrectly reports all avatars received COF version as -1
2016-08-16 17:48:52 +03:00
304b9726de
Merge Firestorm LGPL
2016-08-15 16:42:36 +02:00
57da9bcd1b
merge from viewer-release
2016-08-15 09:52:06 -04:00
b18cee4f33
Merge viewer-bear
2016-08-11 21:48:43 +02:00
d47f8e1abe
Merge viewer-bear
2016-08-10 21:29:01 +02:00
d2bea3c4c5
Merge viewer-lynx
2016-08-10 20:44:31 +02:00
f4f30dae0f
MAINT-6612 Server release notes in Help -> About Second Life never fetch on any region.
2016-08-08 21:31:11 +03:00
138fd9d75d
Merged in lindenlab/viewer-lynx
2016-07-28 00:52:37 +03:00
974e5e5868
MAINT-6511 Replaced c-style casts with dynamic_cast in llfloater.cpp
2016-07-28 00:15:49 +03:00
9153b343f2
Merge viewer-bear
2016-07-26 19:55:17 +02:00
446a718b6c
Merge viewer-lynx
2016-07-20 20:33:49 +02:00
936681cb82
MAINT-6568 Detached Object Ends up in Root of Inventory
2016-07-25 11:18:20 +03:00
55231519c7
Merge viewer-bear
2016-07-18 14:32:34 +02:00
efb49c8ccf
Merged in lindenlab/viewer-lynx
2016-07-18 13:08:04 +03:00
0db98a6308
merge changes for STORM-2133
2016-07-14 11:35:14 -04:00
d2cf09e7d2
STORM-2133: VOICE-36 prevents proper shutdown of connector
2016-07-14 10:28:54 +02:00
0f16de2208
Merge viewer-bear
2016-07-07 00:44:59 +02:00
a8414a5461
Merge viewer-bear
2016-07-06 10:15:16 +02:00
69de29d74e
MAINT-6552 Contribution: Viewer sometimes crashes when opening oversized textures
2016-07-06 10:22:50 +03:00
c2320fa0d0
MAINT-2141 Sky Cloud Coverage reverts to 0.27 when toggling view back to region sky
2016-06-29 16:44:25 +03:00
54ad513fcb
Merge viewer-bear
2016-06-24 11:35:43 +02:00
ba36b366db
MAINT-6514 Appearance Mode Body Parts Select shows wrong type
2016-06-22 12:55:30 +03:00
84396f4e27
MAINT-6513 Math rounding errors
2016-06-21 16:25:18 +03:00
83f49db1e2
Sync contributions.txt
2016-05-28 14:40:40 +02:00
cb968152b0
Merge viewer-bear
2016-05-28 14:34:35 +02:00
057c034cb4
Merged in lindenlab/viewer-lynx
2016-05-28 01:03:56 +03:00
7d54c62016
MAINT-6397 cut items should not go to trash
2016-05-25 20:37:52 +03:00
757414afb8
Updated contributions.txt
2016-05-25 17:20:13 +03:00
61a5c943ba
MAINT-6432 Fix defaults for RenderAvatarMaxComplexity
...
The 'all' section must be set to the value for high end machines as the minimum of high-end and recommended setting will be applied
2016-05-22 20:32:27 +02:00
919521d121
Merge Firestorm LGPL tip
2016-05-21 19:02:00 +02:00
f47ceb47bb
merged jelly-doll viewer-release into bento
2016-05-21 08:15:28 -04:00
8d123edb56
Merge Firestorm LGPL
2016-05-09 14:15:08 +02:00
62b508ed7e
Merge bento-box
2016-05-09 13:15:50 +02:00
a0188a5358
Merge Firestorm LGPL
2016-05-09 12:41:24 +02:00
2d8b53854e
merge
2016-05-06 11:00:47 -04:00
950c41d184
merge 4.0.4-release and MAINT-5974
2016-05-06 10:28:42 -04:00
393072b9d6
SL-344 - contributions.txt update
2016-05-04 08:43:26 -04:00
41dee0f748
MAINT-1211 - updated contributions.txt
2016-05-04 08:31:25 -04:00
2fc4562c9f
Merge viewer-bear
2016-04-23 11:52:26 +02:00
a07897bf9c
contributions.txt edited online with Bitbucket
2016-04-21 01:27:52 +00:00
14954d999d
Merge viewer-quickgraphics
2016-03-31 18:54:45 +02:00
c3fd3b41e8
add contribution for MAINT-6218 (alpha-ed avatar showing)
2016-03-23 14:38:38 -04:00
d171e16c58
Merge Firestorm LGPL
2016-03-18 10:16:25 +01:00
31f3db0291
merge changes for DRTVWR-417
2016-03-16 13:08:06 -04:00
faf58a81eb
Merge viewer-bear
2016-03-08 09:08:20 +01:00
3192fe832f
Merge viewer-quickgraphics
2016-03-08 01:41:31 +01:00
5822fb00b6
merge DRTVWR-398 build cleanup fixes
2016-03-07 12:41:11 -05:00
f4e3306517
Updated contributors.txt
2016-02-29 18:09:25 +02:00
bc48a22db8
Merge Firestorm LGPL
2016-02-26 13:15:13 +01:00
0a741843ca
Merge viewer-bear
2016-02-21 02:35:15 +01:00
f5c133712b
Updated contributors.txt
2016-02-21 00:43:35 +02:00
a0fa2e5762
Merge viewer-bear
2016-02-19 10:30:02 +01:00
d8f7a40dea
Added newly created tickets for Kitty's fixes to contributors.txt
2016-02-19 04:05:09 +02:00
3e56ba7d6c
Updated contributors.txt
2016-02-19 00:22:06 +02:00
51909c8efa
Merge Firestorm LGPL
2016-02-15 10:31:04 +01:00
79dcb1ca11
STORM-2124 - Update fonts.xml with default CJK font collections in OS X 10.11 and Windows 10; by Cinder Roxley, with modifications for Firestorm
2016-02-13 20:42:13 +01:00
4fd57774dd
OPEN-297 simplify build number generation
2016-02-07 14:58:47 -08:00
867ef882fd
merge changes for OPEN-292
2016-02-07 13:41:41 -08:00
e7ade840e4
Merge viewer-bear
2016-01-24 14:00:30 +01:00
354812cc68
Merge Firestorm LGPL
2016-01-16 19:10:08 +01:00
bc22e58743
merge changes for 4.0.1-release
2016-01-15 16:55:04 -05:00
77156c2b15
MAINT-1392 HUD objects Behave Badly in conjunction with the Mouse Scroll Wheel
2016-01-05 13:23:34 +02:00
cc235cdcc4
Merged lindenlab/viewer-tools-update into default
2015-11-29 20:14:22 -07:00
9848fc4253
merge changes for 4.0.1-release
2016-01-15 17:01:16 -05:00
68739bc569
Merge Viewer-Bear
2015-10-27 01:31:15 +01:00
4a187aec4e
MAINT-5756: Unicode characters in online notifications get stripped
2015-10-16 11:28:53 +02:00
83862ed91a
Merge Firestorm tip
2015-10-15 11:02:30 +02:00
69ff937e47
merge changes for 3.8.5-release
2015-10-13 08:43:03 -04:00
d17614ca61
merge changes for 3.8.5-release
2015-10-12 15:24:56 -04:00
736549f03f
STORM-2122: UDP data bandwidth measuring is off by factor 8
2015-10-09 09:26:21 +02:00
5524d38dff
Merge viewer-quickgraphics
2015-10-03 16:38:26 +02:00
67757ddd5b
MAINT-5416 FIXED Cannot right-click a rigged mesh that's worn
...
--HG--
branch : maint-5416
2015-09-04 21:06:22 +03:00
3cd1736f3d
Merge viewer-bear
2015-08-29 11:47:44 +02:00
9c391b3dea
MAINT-5533 FIXED The fragment part of an URI is only shown if it contains a query part as well.
...
fix by Ansariel
2015-08-20 12:04:57 +03:00
71a468c6fb
merge changes for other open sourc contributions
2015-07-30 11:09:00 -04:00
57904b4def
MAINT-5416 Reverted changeset: 9bd24c17d908
2015-07-23 23:59:05 +03:00
269cc894a9
MAINT-5416 FIXED cannot right-click a rigged mesh that's worn
2015-07-17 07:31:36 +03:00
828f89f3a7
correct labels for rendering choices for STORM-2107
2015-06-30 16:46:49 -04:00
aa630cac08
merge buildcleanup
2015-06-25 12:13:10 -04:00
95fc2d48ec
merge changes for 3.7.30-release
2015-06-15 15:53:45 -04:00
5a282abe18
STORM-2113 - uri parsing cleanup and fixes
2015-04-11 15:23:06 -06:00
7a212eb7e5
merge changes for tools update tip
2015-03-26 10:53:53 -04:00
ab30a44d9d
Add Cinder Roxley as contributor for BUG-8835
2015-03-25 03:09:17 +00:00
d6f7a16a68
merge changes for 3.7.26-release
2015-03-23 22:39:18 -04:00
06bc6d14d2
Add myself to contributions list
2015-05-21 11:14:14 +02:00
045779c802
STORM-2105 - Introduct EMBED_MANIFEST cmake macro for Windows and embed in the exes
2015-05-20 22:45:15 -06:00
006190f2a1
Merge with tools update.
2015-05-05 13:09:27 +02:00
83851db09a
merge up to 3.7.25-release
2015-02-27 09:03:04 -05:00
d9673d6c1d
Merged lindenlab/viewer-tools-update into default
2015-02-26 14:55:50 -07:00
905431cf60
merge changes for 3.7.25-release
2015-02-24 15:48:28 -05:00
c8a0aa99b4
STORM-2082 Fix issue with isDirty
2015-02-18 16:48:23 -05:00
8147f4c57a
add Sovereign Engineer to contribution credits
2015-02-18 09:54:06 -05:00
dce1339439
Add myself to contribution
2015-02-14 23:24:06 -08:00
bedbb65b33
STORM-2104 Statistics floaters adjustments
2015-02-12 14:10:20 -05:00
ca08bd5aba
OPEN-292 - Remove lscript from project,
...
Remove legacy udp script upload methods,
Refactor script runtime perms from three arrays to one struct array so we don't have to juggle array order anymore.
2015-02-08 12:53:39 -07:00
53fb7f9998
merge storm-2082 changes
2015-02-04 08:45:49 -08:00
6f3cf79a3a
merge changes for 3.7.24-release
2015-01-13 13:46:45 -05:00
0d6872e1f5
merge changes for STORM-2085
2015-01-06 11:36:10 -05:00
82a56fb9da
merge changes for STORM-2088
2015-01-06 11:35:32 -05:00
4d4ad1afaf
merge changes for STORM-2094
2015-01-06 11:18:45 -05:00
0e5dbc4ef8
merge changes for STORM-2099
2015-01-06 11:16:17 -05:00
7205dbdbe4
merge changes for MAINT-4677
2015-01-06 11:14:58 -05:00
29ccfc46b5
merge changes for STORM-2098
2015-01-06 11:05:55 -05:00
21c535635b
attribute STORM-2083
2015-01-06 11:04:36 -05:00
aeb64da07a
STORM-2100 Incorrect displays in Script Information window
2015-01-06 10:49:02 -05:00
4c96feb0e5
STORM-2099 Minor formatting issue with logged out message
2014-12-31 07:20:52 -05:00
a6dfe5a64e
STORM-2098 - Don't enable object edit for an invalid agent
2014-12-28 14:18:29 -07:00
2d7fb5c675
STORM-2094 Save button not activated if spelling corrected in Notecard and no other changes made
2014-12-28 09:34:28 -05:00
9c56eb9ead
merge changes for 3.7.23
2014-12-19 09:14:53 -05:00
dab5acd972
merge changes for 3.7.22-release
2014-12-15 12:34:18 -05:00
9f88029ca6
STORM-2092 Add "Copy outfit list to clipboard" for COF folder
2014-12-11 18:23:23 -05:00
0db6788347
STORM-2091 "Empty Trash"/"Empty Lost and Found" menu item is active even if empty
2014-12-10 11:09:28 -05:00
bf2e3fca73
merge changes for 3.7.22-release
2014-12-05 17:12:42 -05:00
cacaf21eb5
STORM-2088 Minimap no longer remembers zoom setting between sessions
2014-12-05 09:46:07 -05:00
4f076daeff
Merge downstream code and become 3.7.22
2014-12-02 10:41:20 -08:00
fe5ff3e74a
merge
2014-12-01 16:21:52 -05:00
41500add1e
STORM-2082 Pulled in Oz's render weight changes
2014-11-21 18:33:00 -05:00
44f5d73209
STORM-2086 Convert old style llinfos and llwarns to new format
2014-11-20 16:25:11 -05:00
38703d62e3
STORM-2085 Spelling error and duplicate entry in notifications.xml
2014-11-20 08:37:55 -05:00
5f608c0a23
OPEN-282 Use pthreads for TLS on mac
2014-11-19 08:01:28 -07:00
21a36e2c5b
MAINT-4677: Unexpected behaviour when blocking objects with a / in their name when using compact chat view
2014-11-18 12:15:30 +01:00
22386b18b4
Merge LL 2.7.25
2015-02-24 21:22:32 -08:00
e52d57cba2
Merge LL V3.7.23
2015-01-15 15:44:43 +01:00
99cbf150a0
Merge LL V3.7.21
2015-01-15 13:55:17 +01:00
4dc6285816
Merge LL V3.7.15
2015-01-14 13:06:49 +01:00
a45088cb6b
Merge LL V3.7.11
2015-01-12 12:54:15 +01:00
7ffa456683
STORM-2080: correct fitted mesh rendering on some ATI cards
2014-10-14 11:22:39 -04:00
0311299be2
merge changes for STORM-2053
2014-10-13 17:16:57 -04:00
e7c33a5071
merge changes for STORM-2078
2014-10-13 17:16:22 -04:00
852426d71e
merge changes for 3.7.17-release
2014-10-13 17:13:15 -04:00
9c4a8951ff
MAINT-4455 FIXED stats - UDP Data should not show any comma
2014-09-22 13:30:11 +03:00
08a4d7a277
complete contributions for STORM-2069, STORM-2070, STORM-2071, STORM-2072
2014-09-02 16:25:49 -04:00
ae60558141
merge changes for STORM-2060/STORM-2076
2014-08-21 08:34:39 -04:00
fc0d618c2f
STORM-2078 Editing an objects rotation with the rotation rings often causes the object to jump to position <0,0,0> on the region and rotation changes to <0,0,0>
2014-08-20 23:41:33 +01:00
887510c335
Changed: Updated contributions file.
2014-08-20 16:07:01 +02:00
014a5fa513
merge changes for STORM-2040
2014-08-18 11:56:39 -04:00
b4704f5f8b
Merge viewer-bear and become version 3.7.16
2014-09-09 21:53:14 +03:00
7d9372b96d
MAINT-4323 FIXED Mouselook - right-click locks cam position (mac-only)
2014-09-04 14:13:47 +03:00
bca5c1ed79
Changed: Updated contributions file.
2014-08-15 22:41:10 +02:00
9d406f69cc
Changed: Updated contributions file.
2014-08-14 03:27:13 +02:00
210ff45bd6
corrected contributions.txt for OPEN-217
2014-08-06 17:42:29 -04:00
7ede86c97a
merge changes for STORM-2031
2014-08-06 16:18:45 -04:00
7062026da4
merge changes for STORM-2030
2014-08-06 16:17:55 -04:00
129c2db2d2
merge changes for STORM-2040
2014-08-06 15:34:08 -04:00
a45e727049
Add this to contributors.txt
2014-08-06 16:43:43 +00:00
b746d40678
Changed: Updated contributions file.
2014-08-01 20:17:05 +02:00
b5ac12d7b9
Changed: Updated contributions file with BUG-372 and BUG-1179.
2014-08-01 01:51:42 +02:00
0a120f75c3
Changed: Updated contributions file.
2014-08-01 00:37:58 +02:00
60c51f9bc4
Changed: Contribution file and updated it with all new STORM jira's that were fixed.
2014-07-31 07:27:52 +02:00
048be2eec3
Added: STORM-2040 tag to NiranV Dean's name.
2014-07-26 14:10:28 +02:00
009a3028ef
Added: NiranV Dean to contribution list.
2014-07-25 10:17:01 +02:00
8192a3c5b2
merge changes for STORM-2034
2014-07-21 10:00:09 -04:00
2b731d5f06
merge changes for STORM-2037
2014-07-16 13:46:47 -04:00
4cba2c4457
BUG-6659 On the Edit tab of the build menu, clicking the area in between the full bright checkbox and the materials drop down box opens the color picker.
2014-07-12 11:19:05 +01:00
e3a27586f1
STORM-2037 - Update fetchKeywordsFileresponder to use latest LLHTTPClient::responder changes
2014-07-09 09:10:10 -06:00
8d2e0fb3a0
STORM-2035 - Invert the background color in script editors for highlighting sections. Since the background color can be changed by the user, this ensures distinctive highlighting
2014-06-20 13:43:31 -06:00
984353d7ca
STORM-2036 - Fix trying to parse caps too early by adding a callback to check region caps when they haven't already been received
2014-06-20 11:02:50 -06:00
89837f3852
STOMR-2034 XML adjustments and a bit of code cleanup
2014-06-06 14:56:11 -04:00
4fffc8c8e4
STORM-2031 Display issues with Top colliders/Top scripts floater
...
OPEN-217 Change to media_plugin_quicktime.cpp causes Windows compile to fail
2014-05-13 12:30:29 -04:00
3b95bffedd
STORM-2030 Forgot to add entry to contributions.txt
2014-05-12 16:55:17 -04:00
9353868d91
merge changes for STORM-1831
2014-04-23 11:53:05 -04:00
6c8bddca3d
merge changes for STORM-1915
2014-04-22 16:01:45 -04:00
b4ca93cadc
merge up to 3.7.6-release
2014-04-22 13:05:26 -04:00
cd382d08c8
add Cinder Roxley to contributors for STORM-1831
2014-04-22 13:04:36 -04:00
d60519d253
merge changes for STORM-2007
2014-03-18 10:46:52 -04:00
c617a2aa33
merge changes for STORM-1966
2014-03-18 09:10:19 -04:00
51e04f8866
merge changes for open-209
2014-03-14 14:54:45 -04:00
a64b1d0d30
merge changes for storm-2007
2014-03-14 14:34:06 -04:00
56d1db4875
merge changes for storm-1920
2014-03-14 14:19:36 -04:00
e9116575bf
OPEN-209: Corrected all instances of trigraphs in the code.
...
Trigraphs can cause some real special headaches. The only part that's annoying is the comment in newview/llimview.cpp where there's an unfortunate collision of a trigraph sequence with a character sequence that could be displayed by the viewer. Thankfully, it's only a comment!
2014-03-13 20:36:05 -07:00
54bc8b10ee
merge changes for storm-2018
2014-03-11 16:43:00 -04:00
529edff468
restore the relevant fixes for STORM-2011
2014-03-11 14:03:38 -04:00
2b4d3fff70
back out STORM-2011 due to conflict
2014-03-10 15:46:49 -04:00
2d6314f93f
STORM-2018 Group invite fails to let you join groups when groups maxed even when you leave group
2014-03-07 12:50:08 -05:00
208d9a2d21
merge changes for storm-2010
2014-03-06 14:55:11 -05:00
43eae43798
merge changes for storm-68
2014-03-06 13:01:12 -05:00
9185f1e256
merge changes for storm-2008
2014-03-06 08:30:47 -05:00
a373a7442c
merge changes for 3.7.2-release
2014-03-04 13:15:43 -05:00
ef794e7ffc
merge changes for storm-2015
2014-03-04 11:55:42 -05:00
413d29d3ee
merge changes for bug-1044
2014-03-04 11:22:19 -05:00
fe2801fc63
STORM-2017: Added translatable help text to rotation.
...
I chose the camera’s up vector to place the help text as it provided a consistent location on the screen for the user to see the text pop up.
While doing this I realized that the calls to hud_render_utf8text utilized a condition that was guaranteed to be false based on a surrounding if-statement, and so could trivially be replaced with a constant.
Also cleaned out a compiler warning about unused private member variables in llmaniptranslate. I don’t like warnings and useless code. :P
2014-03-03 21:50:12 -08:00
fbdbea1b18
merge changes for 3.7.2-release
2014-03-03 17:01:19 -05:00
ce284c28d8
merge changes for 3.7.2-release
2014-03-03 15:43:55 -05:00
a5e56067c2
merge changes for 3.7.2-release
2014-03-03 15:36:34 -05:00
55ceeae752
merge changes for storm-2008
2014-03-03 15:29:32 -05:00
dfbc6c65f6
merge changes for open-203
2014-03-03 15:08:20 -05:00
840e1da8aa
STORM-2017 Untranslatable text appears when scaling, or moving objects
2014-03-03 14:08:26 -05:00
1d30fe9554
merge changes for 3.7.2-release
2014-02-25 13:31:01 -05:00
199e65a6c5
STORM-2015 Region restart sound alerts from all users on a STORM-1980 enabled viewer play inworld - should be local only.
2014-02-24 10:57:53 -05:00
b0c255f4e6
merge up to 3.7.0-release and get unit test fixes
2014-02-11 09:20:58 -05:00
61dde95630
STORM-1915 Add name to contributors
2014-02-10 20:19:54 -05:00
7b2cc02863
Merge LL fitted mesh
2014-02-06 00:41:33 -08:00
8312517857
merge changes for storm-2011
2014-01-31 16:21:50 -05:00
48dbcd1d43
STORM-2010: fix to AutoAcceptNewInventory
2014-01-29 18:16:04 -05:00
86676ec34b
STORM-2011: Group member lists not loading properly
2014-01-28 19:45:50 +01:00
d8cc2476b3
merge changes for MAINT-3187
2014-01-24 15:00:52 -05:00
b2cc4feed2
correct coding style problems, add contribution credit
2014-01-23 13:41:52 -05:00
197db4976a
merge changes for 3.6.13-release
2014-01-23 11:07:32 -05:00
c241bb2af8
merge changes for storm-1972
2014-01-22 17:14:13 -05:00
316bf51482
MAINT-3187: Name list controls do not properly resolve avatar names
2014-01-21 15:11:10 +01:00
ebac8c0a2a
STORM-2007 Buy floater displays truncated names/permissions when object is set to sell original and sell copy.
2014-01-14 10:34:08 -05:00
a25bcb8523
merge changes for storm-1980
2014-01-07 13:44:22 -05:00
69c32b04cf
merge changes for 3.6.12-release
2014-01-07 11:39:06 -05:00
30f0d61510
merge changes for 3.6.12-release
2014-01-03 12:14:03 -05:00
94ac0ffdc3
merge changes for 3.6.12-release
2013-12-19 17:32:58 -05:00
8b01fd42b0
merge changes from project qa viewer
2013-12-19 17:30:58 -05:00
9f056c1ddd
merge changes for open-113
2013-12-17 11:16:02 -05:00
e774431783
merge changes for storm-1993
2013-12-16 13:31:49 -05:00
f1acdc56b2
merge changes for storm-1992
2013-12-16 13:30:56 -05:00
8df635f8bf
merge changes for storm-1989
2013-12-16 13:30:00 -05:00
01cdc87d05
merge changes for storm-1987
2013-12-16 13:29:12 -05:00
a57bcc2790
merge changes for storm-1986
2013-12-16 13:28:05 -05:00
36281d53ff
merge changes for storm-1981
2013-12-16 13:27:13 -05:00
dec487cd7f
merge changes for 3.6.12-release
2013-12-12 15:51:43 -05:00
81d1d427f1
OPEN-113 Build > Upload > Model > Calculate weights & fee is not disabled in OS built viewers
2013-12-11 10:41:28 -05:00
5b40445e66
STORM-1993 In the About Land floater only send object return time to server when it has been changed
2013-12-04 19:38:52 -05:00
e390255de6
STORM-1992 'Open voice connection' and 'Expand participant list' buttons are overlapping each other in IM conversation after resizing.
2013-12-04 19:33:10 -05:00
56f9b9c048
STORM-1989 Overlapping UI elements in Upload Model floater
2013-12-03 04:19:23 -05:00
0c6d06692e
merge changes for storm-1987
2013-11-27 12:02:04 -05:00
d533dcebf7
STORM-1987 Inconsistent menu naming and behavior in Places floater
2013-11-27 10:26:27 -05:00
db8e4824e7
STORM-1986 Added right click Show on Map context menu for Inventory floater landmarks
...
Possible fix for BUG-4593
2013-11-26 19:43:15 -05:00
ced4ccdbd2
merge changes for storm-1984
2013-11-26 19:18:04 -05:00
fe3a930623
merge fix for STORM-1984
2013-11-26 16:09:43 -05:00
6b1d835f95
STORM-1981 Rough initial changes for evaluation purposes.
2013-11-24 15:46:21 -05:00
45bc601563
merge changes for 3.6.11-release
2013-11-21 14:08:38 -05:00
0031e9a97b
merge up to 3.6.10-release; some of the storm-68 changes lost
2013-11-19 17:59:55 -05:00
7f39d0472e
merge changes for STORM-1831
2013-11-18 13:51:24 -05:00
84a96cdf0f
correct attribution for open-195
2013-11-18 11:33:58 -05:00
3358102462
STORM-1984: Mousing over UI elements does not make them light up
2013-11-14 22:13:15 +01:00
f8846713ce
add open-195 to doc/contributions.txt
2013-11-14 09:16:34 -05:00
bea2e9822b
Fixing some references to 'filename' I forgot to rename to mFullFileSpec.
2013-11-09 11:51:45 +00:00
5ca4a4b8f3
merge changes for storm-1982
2013-11-05 13:53:23 -05:00
2454bcc8db
STORM-=1982 Remove duplicate entry in settings.xml
2013-11-05 10:24:41 -05:00
caaaa1e5e6
STORM-1980 Play sound for region restarting message
2013-11-05 10:01:41 -05:00
e3739edeff
BUG-3764: Groups count in groups list does not display if floater is resized
2013-11-02 21:57:06 +01:00
d61c6ad48b
merge changes for storm-1975
2013-11-01 08:46:32 -04:00
07c011bc9c
STORM-1975 IM windows occasionally report false typing status.
2013-10-29 15:12:39 -04:00
07b5e702e6
BUG-3968: do not wear an object when renaming in inventory
2013-10-29 13:59:21 -04:00
994ecbed34
add credit for BUG-3863
2013-10-29 13:53:43 -04:00
6480612a91
Merge 3.6.9 ShareStorm
2013-10-25 10:23:11 -07:00
c9775dde62
merge up to 3.6.9-release
2013-10-23 13:05:59 -04:00
62999da4d0
Pull merge from oz_linden/336-snowstorm
2013-10-17 13:05:08 -07:00
9c313aea13
merge changes for DRTVWR-336
2013-10-15 17:47:37 -04:00
cda6e4488a
STORM-1972 Add forgotten credit in contributions.txt
2013-10-11 18:40:35 -04:00
0c1d6d7d9e
Merge v3.6.7 in
2013-10-04 20:47:54 +01:00
4dccf30bf3
merge changes for 3.6.7-release
2013-10-03 18:04:27 -04:00
0103cac1dd
Merge viewer-bear maint RC changes to get this build closer to the RC it will follow
2013-09-26 11:44:40 -07:00
3603c4f992
Merge ll 3.6.11
2013-11-23 20:22:24 -08:00
6a9d23b71a
merge changes for open-189
2013-09-12 14:07:12 -04:00
0142a0c6a9
OPEN-189 Add missing header guard
2013-09-11 19:02:36 -04:00
f70296ec68
merge changes for storm-1902
2013-09-11 15:25:24 -04:00
f6bcf6dd39
merge changes for vwr-29543
2013-09-11 12:47:25 -04:00
f4d2e21f4f
Changing shortcut to toggle preference floater
2013-09-11 12:17:22 -04:00
d53f9366d0
merge changes for storm-1888
2013-09-09 16:04:45 -04:00
e7ac4695e3
Merge viewer-release
2013-09-09 12:59:17 -07:00
2df58f775f
Merge viewer-release 3.6.6
2013-09-09 12:43:10 -07:00
c4b070ae00
merge changes for 3.6.5-release
2013-09-09 14:51:34 -04:00
2108e9de5b
OPEN-149: fix documentation of LLColor4 constructor for F32 vector
2013-09-04 16:37:33 -04:00
1a72325ef1
merge changes for open-154
2013-09-04 16:15:15 -04:00
96f0d930bc
merge changes for open-187
2013-09-04 09:18:53 -04:00
5172d4edac
OPEN-187: Properly cleanup all allocated OpenSSL structures.
2013-09-03 13:50:35 -04:00
f3043428b0
merge changes for storm-1933
2013-08-29 12:54:52 -04:00
5b799244c3
merge changes for storm-1929
2013-08-28 13:05:07 -04:00
a359d9d80c
merge changes for 3.6.4-release
2013-08-27 10:37:02 -04:00
27d637d0f1
Merge downstream code from CHUIStorm release
2013-08-26 14:43:23 -07:00
7ca10e5161
merge changes for 3.6.4-release
2013-08-26 15:14:12 -04:00
1e2a6ee3f4
merge changes for maint-2773
2013-08-22 14:39:40 -04:00
be07694b9c
MAINT-2773: Disable texture animation doesn't work
2013-08-22 00:51:15 +02:00
ba248b8b5d
merge changes for storm-1953
2013-08-21 10:44:12 -04:00
c15d2e87ac
merge changes for storm-1952
2013-08-21 10:40:57 -04:00
c42a91421f
merge changes for 3.6.3-release
2013-08-20 10:37:10 -04:00
70cacc4d17
merge changes for 3.6.3-release
2013-08-19 15:51:40 -04:00
82bf4e4db2
merge changes for DRTVWR-285
2013-08-19 15:15:15 -04:00
731fe3e7c6
merge changes for 3.6.3-release
2013-08-19 15:14:23 -04:00
d2b947c1fa
merge changes for STORM-1932
2013-08-14 18:12:01 -04:00
e7bc0e6e63
BUG-3605 / CHUIBUG-197 Don't create excessive amounts of string objects in LLNormalTextSegment::getNumChars.
2013-08-14 01:00:41 +02:00
b75213b39a
open-185: remove duplicate gperftools entry in autobuild.xml
2013-08-05 11:19:54 -04:00
91f7d0d154
merge changes for storm-1838
2013-07-29 15:19:54 -04:00
fd3d20e20d
add credit for storm-1958
2013-07-29 14:49:19 -04:00
22a931efad
STORM-1957 World Map - Land For Sale is missing L$ / sqm
2013-07-28 10:42:51 -04:00
9f393c1d99
merge up to latest snowstorm integration branch
2013-07-24 14:40:23 -04:00
f81e2ce680
credit Cinder with STORM-1951
2013-07-24 14:28:30 -04:00
725288e93a
add contributions for Materials
2013-07-16 15:53:37 -04:00
c18c1f2def
merge changes for storm-1952
2013-07-15 15:37:45 -04:00
c50f44e04e
Merge viewer-release 3.6.5
2013-08-26 14:57:54 -07:00
547fb5da61
Make sure TankMaster is in the contribs for STORM-1950
2013-08-22 17:38:55 -07:00
ecb1e57326
merge changes for storm-1953
2013-07-02 12:55:52 -04:00
836ad301dc
merge changes for STORM-1948
2013-07-02 12:07:00 -04:00
35b27d558c
Merged lindenlab/viewer-release into default
2013-06-27 21:35:23 -06:00
97ed20a12b
Merged lindenlab/viewer-release into default
2013-06-27 21:31:48 -06:00
7e0bc07e5c
Merged lindenlab/viewer-release into default
2013-06-27 21:22:44 -06:00
b615858d6c
Merging last four months of development
2013-06-26 17:39:23 +01:00
79029149a4
Automated merge with file:///F:%5Cviewer-bear
2013-06-21 12:51:29 -05:00
9ea2d90a0d
Automated merge with http://bitbucket.org/lindenlab/viewer-release
2013-06-20 12:10:26 -05:00
1108cd0e5c
merge changes for 3.6.0-release
2013-06-19 17:56:43 -04:00
9c83d4b5b8
Merge with viewer-release.
2013-06-19 15:47:57 -04:00
b3c010ea71
Pull merge lindenlab/viewer-release
2013-06-19 12:24:44 -07:00
e23228fef2
merge 3.5.0-release
2013-06-19 13:59:52 -04:00
761bf254a4
merge changes for 3.6.0-release
2013-06-17 16:50:35 -04:00
0af636e632
Merged with viewer-release
2013-06-17 04:39:47 -04:00
9b23298970
STORM-1953 Notifications that involve deleting something -- errors in text
2013-06-13 15:40:12 -04:00
2268bf3833
merge changes for 3.5.3-release
2013-06-13 15:28:13 -04:00
4f7b8a7e86
STORM-1952: Add a confirmation modal when ejecting a member from a group
2013-06-11 18:54:54 -06:00
a2fa9a2bc2
merge changes for 3.5.3-release
2013-06-06 16:46:31 -04:00
c3f14b915c
NORSPEC-229 Fix for bad binormals on mirrored surfaces (use tangent calculator instead of binormal calculator, convert binormal centric code to tangent centric)
2013-06-03 12:50:48 -05:00
90a3285e26
CHUI-941 [CHUIBUG]Inline input is not available in 3.5.0
2013-05-31 20:05:12 +03:00
507ce0d84f
Merge downstream code
2013-05-29 14:42:19 -07:00
3698aece0d
Merge latest viewer-release
2013-05-29 14:37:22 -07:00
c3804fd041
MATBUG-8: fix local texture support for normal and specular maps
2013-05-24 11:47:06 -04:00
4cf16ffdfb
STORM-1888: Hide Spellchecker Settings floater when Preferences floater is closed
...
Bonus: Correct the immediately preceding auto replace comment
2013-05-22 21:43:32 -06:00
5758b9e304
merge changes for 3.5.3-release
2013-05-22 11:09:43 -04:00
2df5b9caa6
BUG-2432: Crashfix. Don't call map::erase when the iterator is not valid.
2013-05-21 17:25:51 -04:00
72e7269da3
merge changes for 3.5.2-release
2013-05-20 09:08:20 -04:00
46eface63c
NORSPEC-181 Fix for performance regression.
2013-05-14 16:20:54 -05:00
3779e51bfc
Merged with https://bitbucket.org/lindenlab/viewer-beta
2013-05-13 22:22:51 -04:00
38c1cd2d29
STORM-1948 - Fix for Set home to here - screen_home.bmp not saved
2013-05-13 17:18:38 -06:00
4d22c32aa9
merge changes for 3.5.2-beta4
2013-05-10 10:56:40 -04:00
ee2fce8790
Merge downstream code and viewer-beta
2013-05-09 14:10:45 -07:00
8895e79576
Merge downstream code / viewer-beta
2013-05-09 13:21:22 -07:00
c7f7c4bc4d
Merge viewer-beta
2013-05-09 13:14:49 -07:00
1b984d8f40
merge changes for 3.5.1-release
2013-05-08 14:46:00 -04:00
cf37c67764
Merge downstream code from viewer-bear
2013-04-30 10:02:05 -07:00
35f7a75083
Merge in downstream code from viewer-beta
2013-04-29 15:12:54 -07:00
5af5b49a62
Merge in downstream viewer-beta
2013-04-29 12:05:44 -07:00
bfb1ab134f
merge changes for 3.5.1-beta3
2013-04-23 14:29:24 -04:00
06d7845a5a
SUN-72 SH-4132 FIX viewer builds cannot write to paths containing special characters.
...
Integrated Nicky Dasmijn's patch to handle the unicode file paths properly.
Code reviewed, patch was clean.
Tested locally, correctly allows wearables to load where they would fail before.
Should be ready for automated build & QA.
2013-04-22 19:14:24 -04:00
ddd5659f81
merge changes for DRTVWR-294
2013-04-19 10:11:29 -04:00
ed2b5da8f1
merge changes for DRTVWR-298
2013-04-18 14:55:28 -04:00
490edf41eb
BUG-2326 MAINT-2596 FIX crash when selecting non-existant user in resident picker
...
Added checks to validate that the selection list is non-empty
2013-04-17 19:20:42 -04:00
88eff41649
Merge with viewer-development
2013-04-17 13:38:04 -07:00
2fde4a9ae5
merge changes for 3.5.0-beta7
2013-04-01 14:24:01 -04:00
5098d43a9b
STORM-1941: Cocoa project viewer: some coordinate conversions are off (Katharine Berry)
2013-04-01 08:25:11 -04:00
bf6182daa8
Update Mac and Windows breakpad builds to latest
2013-03-29 07:50:08 -07:00
76f8d755b0
merge changes for storm-1931
2013-03-25 15:37:45 -04:00
a976f5c217
Pull and merge downstream code with CHUI viewer-development by way of viewer-lion
2013-03-25 12:19:02 -07:00
98a82c50d5
Pull in downstream CHUI code from viewer-development
2013-03-25 11:12:52 -07:00
6f2fef886e
merge changes for storm-1911
2013-03-25 10:53:37 -04:00
bd57150f13
merge changes for storm-1910
2013-03-20 16:37:00 -04:00
4b1c1e4e02
merge changes for storm-1931
2013-03-20 15:33:09 -04:00
d5561a1ada
Merge in viewer-beta to get CHUI code
2013-03-19 16:20:53 -07:00
6807214bb9
merge changes for 3.5.0-beta3 (chui)
2013-03-19 15:25:22 -04:00
ca17a74f18
merge changes for storm-1910
2013-03-19 15:21:16 -04:00
ed7785bf97
merge up to 3.5.0-beta3 (chui)
2013-03-18 14:30:57 -04:00
a625dbe35e
merge changes for 3.5.0-beta3
2013-03-15 15:42:21 -04:00
75722baf29
merge changes for latest viewer-development
2013-03-13 15:15:15 -04:00
e5aa9088f0
CHUI-810 : Merged Marine Kelley's patch on selected text and use of return key in chat
2013-03-11 14:59:53 -07:00
f061b2b90e
Optimize interp code to elim hundreds of divides per frame and fix jitter bugs.
2013-03-08 15:31:37 -08:00
2e8b2558b4
For MAINT-2436 and MAINT-2388 contribs from STORM-1935 and STORM-1936
2013-03-07 14:13:14 -08:00
2ea750ebca
For MAINT-2247 MAINT-1742 MAINT-2275 contrib from STORM-1934.
2013-03-05 13:47:02 -08:00
93eaccae6f
Modify LLInstanceTracker to avoid using a map of strings to find a map of foo to find some pointers
2013-02-28 15:35:14 -08:00
f3025b0ae4
STORM-1933: Certain show in search categories for parcels will not stay selected
2013-02-23 02:01:07 +01:00
bf981db8b9
STORM-1932: Region/Estate floater contains unlocalizable strings
2013-02-23 00:12:08 +01:00
2474385a2a
STORM-1931: Added option to disable chat animations (say/whisper/shout)
2013-02-22 11:19:51 +01:00
010c87788d
Merge with HEAD
2013-02-15 10:15:58 -08:00
cc260a6356
Automated merge with https://bitbucket.org/lindenlab/viewer-cat
2013-02-14 12:16:37 -06:00
bc60d34f68
MAINT-2368 Pull in Firestorm fix for textures unloading behind you.
2013-02-14 12:15:59 -06:00
c880c961bb
merge changes for 3.4.5
2013-02-14 09:05:55 -05:00
94ae64d6fd
Pull and merge viewer-release
2013-02-12 14:59:59 -08:00
8bb3d0891d
merge up to 3.4.5-release
2013-02-12 13:27:03 -05:00
bfffedaec9
Trivial whitespace change to ignite new Team City build after some admin work
2013-02-06 15:09:44 -08:00
5766592712
Updated contributions text file with people who worked on the FMOD upgrade patch
2013-02-06 13:57:51 -08:00
1407f4f11a
STORM-1831 Start updating work from 2012-03/04 to be in line with current viewer-release.
2013-02-05 07:18:44 +00:00
0908b60c1c
STORM-1930 Quality & Speed slider has Ultra label where High should be.
2013-02-01 08:10:16 +00:00
0092ec9bd9
STORM-1929 Top bar: speaker icon clipped, overlapping UI elements
2013-01-28 16:37:03 -05:00
0a1a351b86
Merge Viewer-Share
2013-10-21 23:51:34 -07:00
6007d1235e
merge snowstorm repo
2013-10-19 23:48:44 -07:00
52d9b07503
Merge viewer-bear
2013-09-12 21:15:34 -07:00
9202bce3d7
OPEN-189 Add missing header guard
2013-09-11 19:02:36 -04:00
c69f3acef8
Merge LL 3.6.5
2013-09-09 19:07:03 -06:00
5a8d94c50f
Merge LL 3.6.4 pass 1
2013-08-28 00:10:39 -07:00
831e4f443b
Merge LL 3.6.3 pass 1
2013-08-26 17:09:27 -07:00
3e3fda589b
merge up to 3.4.4-release
2013-01-18 16:37:07 -05:00
841dc5da2e
merge up to 3.4.4
2013-01-17 13:54:39 -05:00
30b48351f9
OPEN-161 Typo in the header guard.
2013-01-16 19:19:19 -05:00
718f6fa0ff
merge LL 3.6.1
2013-07-10 00:23:23 -07:00
d4640277d0
Merge LL 3.5.3 release.
2013-07-09 16:24:58 -07:00
14001c54df
Gastly CHUI merge pass 1, don't count on anything to work.
2013-06-26 12:14:54 -07:00
Ansariel