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
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
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
3e3fda589b
merge up to 3.4.4-release
2013-01-18 16:37:07 -05:00
30b48351f9
OPEN-161 Typo in the header guard.
2013-01-16 19:19:19 -05:00
4de7c27d93
Merge in viewer-development
2013-01-14 09:31:57 -08:00
954ebaed84
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
2013-01-08 13:40:59 -06:00
b75fc0af89
merge up to 3.4.4 beta
2013-01-04 10:23:22 -05:00
584b615c34
merge changes for storm-1918
2013-01-04 10:21:00 -05:00
aa3a65f5aa
MAINT-2087 Cleanup XML changes from new preferences hash marks
2012-12-12 13:58:24 -06:00
ee8240447b
Add myself as a contributor
2012-12-06 19:00:03 -08:00
ce46d524ac
merge changes for storm-1919
2012-11-27 11:20:09 -05:00
cceeacc726
merge storm-1855 to latest viewer-development
2012-11-27 11:18:52 -05:00
b70cc0ba53
STORM-1919: Fixed snapping of rotation in the edge-on case
...
Simply had to guard the snapping code, making sure that the last "else" case was preserved when either the outer or the inner tests failed.
2012-11-26 18:39:37 -08:00
5d34ac552f
Automated merge with https://bitbucket.org/lindenlab/viewer-development
2012-11-20 17:03:55 -06:00
b8e036dff5
STORM-1918 Part of the group notice attachment box does not allow dropping of assets.
2012-11-13 12:15:36 -05:00
60f69c383c
merge changes for storm-1892
2012-11-09 15:21:46 -05:00
8695619c82
merge changes for storm-1894
2012-11-09 15:15:28 -05:00
07cc38e9cb
STORM-1855: Improve performance of pasting large blocks of text in the script editor
2012-11-09 15:12:15 -05:00
2fd843c118
MAINT-873 Fix for inability to upload meshes on some systems.
2012-10-17 15:33:01 -05:00
378e9528d4
MAINT-873 Fix for inability to upload meshes on some systems.
2012-10-17 15:33:01 -05:00
9db74ae962
MAINT-1138 Fix for crash when picking rigged attachments.
2012-10-09 18:27:42 -05:00
6c989a692d
MAINT-1138 Fix for crash when picking rigged attachments.
2012-10-09 18:27:42 -05:00
005cd40247
STORM-1911: Go-to line function for the internal LSL script editor
2012-09-19 00:49:34 +02:00
80ae45238b
STORM-1910: Adds the count of groups and the remaining free group slots to the group list
2012-09-13 23:01:14 +02:00
185169cbbe
correct attribution for STORM-1868 (add Wolf Loonie)
2012-11-15 11:29:38 -05:00
695c4135ff
Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased
2012-09-07 14:47:24 -04:00
af6e665d5c
MAINT-1491 Fix for L&S never being enabled by default on XP/Linux/OS X
2012-09-07 11:22:45 -05:00
Jonathan Yap