Tank_Master
|
3603c4f992
|
Merge ll 3.6.11
|
2013-11-23 20:22:24 -08:00 |
|
Graham Linden
|
6480612a91
|
Merge 3.6.9 ShareStorm
|
2013-10-25 10:23:11 -07:00 |
|
Merov Linden
|
62999da4d0
|
Pull merge from oz_linden/336-snowstorm
|
2013-10-17 13:05:08 -07:00 |
|
Oz Linden
|
9c313aea13
|
merge changes for DRTVWR-336
|
2013-10-15 17:47:37 -04:00 |
|
Oz Linden
|
4dccf30bf3
|
merge changes for 3.6.7-release
|
2013-10-03 18:04:27 -04:00 |
|
Graham Linden
|
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 |
|
Oz Linden
|
6a9d23b71a
|
merge changes for open-189
|
2013-09-12 14:07:12 -04:00 |
|
Drake Arconis
|
0142a0c6a9
|
OPEN-189 Add missing header guard
|
2013-09-11 19:02:36 -04:00 |
|
Oz Linden
|
f70296ec68
|
merge changes for storm-1902
|
2013-09-11 15:25:24 -04:00 |
|
Oz Linden
|
f6bcf6dd39
|
merge changes for vwr-29543
|
2013-09-11 12:47:25 -04:00 |
|
ZaiLynch
|
f4d2e21f4f
|
Changing shortcut to toggle preference floater
|
2013-09-11 12:17:22 -04:00 |
|
Oz Linden
|
d53f9366d0
|
merge changes for storm-1888
|
2013-09-09 16:04:45 -04:00 |
|
simon
|
e7ac4695e3
|
Merge viewer-release
|
2013-09-09 12:59:17 -07:00 |
|
Graham Linden
|
2df58f775f
|
Merge viewer-release 3.6.6
|
2013-09-09 12:43:10 -07:00 |
|
Oz Linden
|
c4b070ae00
|
merge changes for 3.6.5-release
|
2013-09-09 14:51:34 -04:00 |
|
katharine@exodusviewer.com
|
2108e9de5b
|
OPEN-149: fix documentation of LLColor4 constructor for F32 vector
|
2013-09-04 16:37:33 -04:00 |
|
Oz Linden
|
96f0d930bc
|
merge changes for open-187
|
2013-09-04 09:18:53 -04:00 |
|
Nicky
|
5172d4edac
|
OPEN-187: Properly cleanup all allocated OpenSSL structures.
|
2013-09-03 13:50:35 -04:00 |
|
Oz Linden
|
f3043428b0
|
merge changes for storm-1933
|
2013-08-29 12:54:52 -04:00 |
|
Oz Linden
|
5b799244c3
|
merge changes for storm-1929
|
2013-08-28 13:05:07 -04:00 |
|
Oz Linden
|
a359d9d80c
|
merge changes for 3.6.4-release
|
2013-08-27 10:37:02 -04:00 |
|
simon
|
27d637d0f1
|
Merge downstream code from CHUIStorm release
|
2013-08-26 14:43:23 -07:00 |
|
Oz Linden
|
7ca10e5161
|
merge changes for 3.6.4-release
|
2013-08-26 15:14:12 -04:00 |
|
Oz Linden
|
1e2a6ee3f4
|
merge changes for maint-2773
|
2013-08-22 14:39:40 -04:00 |
|
Ansariel
|
be07694b9c
|
MAINT-2773: Disable texture animation doesn't work
|
2013-08-22 00:51:15 +02:00 |
|
Oz Linden
|
ba248b8b5d
|
merge changes for storm-1953
|
2013-08-21 10:44:12 -04:00 |
|
Oz Linden
|
c15d2e87ac
|
merge changes for storm-1952
|
2013-08-21 10:40:57 -04:00 |
|
Oz Linden
|
c42a91421f
|
merge changes for 3.6.3-release
|
2013-08-20 10:37:10 -04:00 |
|
Oz Linden
|
70cacc4d17
|
merge changes for 3.6.3-release
|
2013-08-19 15:51:40 -04:00 |
|
Oz Linden
|
82bf4e4db2
|
merge changes for DRTVWR-285
|
2013-08-19 15:15:15 -04:00 |
|
Oz Linden
|
731fe3e7c6
|
merge changes for 3.6.3-release
|
2013-08-19 15:14:23 -04:00 |
|
Oz Linden
|
d2b947c1fa
|
merge changes for STORM-1932
|
2013-08-14 18:12:01 -04:00 |
|
Nicky
|
e7bc0e6e63
|
BUG-3605 / CHUIBUG-197 Don't create excessive amounts of string objects in LLNormalTextSegment::getNumChars.
|
2013-08-14 01:00:41 +02:00 |
|
Oz Linden
|
b75213b39a
|
open-185: remove duplicate gperftools entry in autobuild.xml
|
2013-08-05 11:19:54 -04:00 |
|
Oz Linden
|
91f7d0d154
|
merge changes for storm-1838
|
2013-07-29 15:19:54 -04:00 |
|
Oz Linden
|
fd3d20e20d
|
add credit for storm-1958
|
2013-07-29 14:49:19 -04:00 |
|
Jonathan Yap
|
22a931efad
|
STORM-1957 World Map - Land For Sale is missing L$ / sqm
|
2013-07-28 10:42:51 -04:00 |
|
Oz Linden
|
9f393c1d99
|
merge up to latest snowstorm integration branch
|
2013-07-24 14:40:23 -04:00 |
|
Oz Linden
|
f81e2ce680
|
credit Cinder with STORM-1951
|
2013-07-24 14:28:30 -04:00 |
|
Oz Linden
|
725288e93a
|
add contributions for Materials
|
2013-07-16 15:53:37 -04:00 |
|
Oz Linden
|
c18c1f2def
|
merge changes for storm-1952
|
2013-07-15 15:37:45 -04:00 |
|
Graham Linden
|
c50f44e04e
|
Merge viewer-release 3.6.5
|
2013-08-26 14:57:54 -07:00 |
|
Graham Linden
|
547fb5da61
|
Make sure TankMaster is in the contribs for STORM-1950
|
2013-08-22 17:38:55 -07:00 |
|
Oz Linden
|
ecb1e57326
|
merge changes for storm-1953
|
2013-07-02 12:55:52 -04:00 |
|
Oz Linden
|
836ad301dc
|
merge changes for STORM-1948
|
2013-07-02 12:07:00 -04:00 |
|
Cinder Roxley
|
35b27d558c
|
Merged lindenlab/viewer-release into default
|
2013-06-27 21:35:23 -06:00 |
|
Cinder Roxley
|
97ed20a12b
|
Merged lindenlab/viewer-release into default
|
2013-06-27 21:31:48 -06:00 |
|
Cinder Roxley
|
7e0bc07e5c
|
Merged lindenlab/viewer-release into default
|
2013-06-27 21:22:44 -06:00 |
|
Dave Parks
|
79029149a4
|
Automated merge with file:///F:%5Cviewer-bear
|
2013-06-21 12:51:29 -05:00 |
|
Dave Parks
|
9ea2d90a0d
|
Automated merge with http://bitbucket.org/lindenlab/viewer-release
|
2013-06-20 12:10:26 -05:00 |