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
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
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
NiranV