Tank_Master
|
097900fcbb
|
Merge LL 3.4.5 beta 5
|
2013-02-05 19:03:17 -08:00 |
|
Whirly
|
0908b60c1c
|
STORM-1930 Quality & Speed slider has Ultra label where High should be.
|
2013-02-01 08:10:16 +00:00 |
|
Tank_Master
|
169263d8b0
|
Merge LL 3.4.5 beta 3
|
2013-01-28 01:56:00 -08:00 |
|
Cinders
|
569f9cf88a
|
Pull in STORM-1921, STORM-1927, STORM-1928: improved Dof, SSAO, and Fog fixes by Tofu Buzzard
|
2013-01-20 07:18:35 -07:00 |
|
Dave Parks
|
954ebaed84
|
Automated merge with https://bitbucket.org/lindenlab/viewer-tiger
|
2013-01-08 13:40:59 -06:00 |
|
Tank_Master
|
cc44316aed
|
Merge LL 3.4.3,
Note: aligned some of our code with LL's, spcifically feature table, gpu table, texture fetching, and some rendering defaults behavior.
|
2012-12-18 00:36:35 -08:00 |
|
Tank_Master
|
5b5f4c8bf5
|
Merge LL 3.4.2 release,
broken revision, KDU package needs updating, mac packager also likely broken
|
2012-12-14 07:59:55 -08:00 |
|
Dave Parks
|
5d34ac552f
|
Automated merge with https://bitbucket.org/lindenlab/viewer-development
|
2012-11-20 17:03:55 -06:00 |
|
Dave Parks
|
2fd843c118
|
MAINT-873 Fix for inability to upload meshes on some systems.
|
2012-10-17 15:33:01 -05:00 |
|
Dave Parks
|
378e9528d4
|
MAINT-873 Fix for inability to upload meshes on some systems.
|
2012-10-17 15:33:01 -05:00 |
|
Dave Parks
|
9db74ae962
|
MAINT-1138 Fix for crash when picking rigged attachments.
|
2012-10-09 18:27:42 -05:00 |
|
Dave Parks
|
6c989a692d
|
MAINT-1138 Fix for crash when picking rigged attachments.
|
2012-10-09 18:27:42 -05:00 |
|
Oz Linden
|
185169cbbe
|
correct attribution for STORM-1868 (add Wolf Loonie)
|
2012-11-15 11:29:38 -05:00 |
|
Nat Goodspeed
|
695c4135ff
|
Automated merge with file:///Users/nat/linden/davep-viewer-development-rebased
|
2012-09-07 14:47:24 -04:00 |
|
Dave Parks
|
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 |
|
Oz Linden
|
43d29ea03e
|
merge changes for DRTVWR-202
|
2012-08-22 17:11:10 -04:00 |
|
Oz Linden
|
0c903609d4
|
merge changes for storm-1895
|
2012-08-16 10:55:31 -04:00 |
|
Oz Linden
|
39d79080c0
|
merge changes for storm-1899
|
2012-08-16 10:33:42 -04:00 |
|
Oz Linden
|
df93749819
|
merge up to latest viewer-development
|
2012-07-31 14:55:15 -04:00 |
|
Ansariel
|
08f35b6a14
|
STORM-1899: Avatar hand poses randomly get stuck in spread position
|
2012-07-26 17:07:12 +02:00 |
|
callum_linden
|
78854c9baa
|
Fix to build with code signing option (patch from STORM-1900)
|
2012-07-25 16:42:37 -07:00 |
|
Cinders
|
9f3f74aa53
|
FIRE-8338: Edge-on prim rotation snaps when snap is disabled - Submitted by Cron Stardust
|
2012-11-25 22:02:27 -07:00 |
|
Oz Linden
|
764d1e3caf
|
merge up to 3.3.3-release
|
2012-06-28 10:35:22 -04:00 |
|
Whirly
|
b4e1d03584
|
STORM-1895 - Rename Delay Restart button to Cancel Restart
|
2012-06-26 15:37:31 +01:00 |
|
Oz Linden
|
4397516ca5
|
merge changes for DRTVWR-168
|
2012-06-21 17:50:41 -04:00 |
|
Oz Linden
|
e30fbb2837
|
merge changes for open-140
|
2012-06-19 12:36:47 -04:00 |
|
Oz Linden
|
d1ac85a589
|
merge changes for open-142
|
2012-06-19 12:34:03 -04:00 |
|
Oz Linden
|
dad85ce554
|
merge changes for storm-1868
|
2012-06-18 14:01:18 -04:00 |
|
Oz Linden
|
bbf8137ce5
|
credit for STORM-1844
|
2012-06-18 13:59:22 -04:00 |
|
Oz Linden
|
83ddded5ab
|
merge changes for storm-1877
|
2012-06-18 13:56:43 -04:00 |
|
Oz Linden
|
d36f74ba33
|
merge changes for storm-1843
|
2012-06-18 12:50:15 -04:00 |
|
Oz Linden
|
9b2daf4b19
|
add credit in contributions.txt
|
2012-06-18 12:48:57 -04:00 |
|
Oz Linden
|
6c0922df91
|
add to contributions.txt
|
2012-06-15 08:39:11 -04:00 |
|
Tank_Master
|
361a413d25
|
Add myself to contributions.txt
|
2012-06-12 09:06:12 -07:00 |
|
Tank_Master
|
76abab0618
|
When using OS autobuild config switches, set build configuration in VS to specified type (release, relwithdebinfo, or debug)
Also, set startup project to SecondLife-bin
|
2012-06-11 13:19:15 -07:00 |
|
Jonathan Yap
|
a64bb32b05
|
STORM-1877 Missing entries in strings.xml for some Inventory folder names
|
2012-06-08 18:05:31 -04:00 |
|
Tank_Master
|
8cb09ca444
|
Merge to FS LGPL 29865
|
2012-08-30 15:45:02 -07:00 |
|
Tank_Master
|
cb24ec2e0d
|
merge LL 3.3.4 beta
autoreplace does not work (needs a hook in nearby chat), no cmd line option to add new stuff
spellcheck only works when packaged
|
2012-07-16 21:59:14 -07:00 |
|
Oz Linden
|
3ebfcd7054
|
merge changes for DRTVWR-163
|
2012-06-08 09:00:05 -04:00 |
|
Oz Linden
|
ada746bd2a
|
merge changes for DRTVWR-161
|
2012-06-06 16:44:55 -04:00 |
|
Oz Linden
|
a4452eef27
|
merge changes for storm-1872
|
2012-06-05 10:44:02 -04:00 |
|
Oz Linden
|
8276228600
|
merge changes for storm-1870
|
2012-06-05 10:43:35 -04:00 |
|
Oz Linden
|
c432ee1581
|
merge changes for storm-1845
|
2012-06-05 10:43:14 -04:00 |
|
Oz Linden
|
2ad0bc334d
|
storm-1703: update license statements
|
2012-06-05 10:02:48 -04:00 |
|
Oz Linden
|
13ca132037
|
merge changes for DRTVWR-157
|
2012-06-04 17:07:27 -04:00 |
|
MartinRJ
|
f9879b8ea9
|
STORM-1845: Move "Show HUD Attachments" to Me menu
|
2012-06-04 17:01:32 -04:00 |
|
Jonathan Yap
|
c2f0a8ef02
|
STORM-1872 A line break is missing in ..\app_settings\settings.xml
|
2012-06-04 16:23:16 -04:00 |
|
Jonathan Yap
|
f58cfdac22
|
STORM-1870 Avatar tracking beacon doesn't get disabled if DESTINATION_REACHED_RADIUS is reached
|
2012-06-01 16:01:40 -04:00 |
|
Oz Linden
|
98457f8455
|
merge changes for storm-1852
|
2012-05-30 14:27:59 -04:00 |
|
Oz Linden
|
6fa682bb77
|
merge changes for storm-1858
|
2012-05-30 14:27:35 -04:00 |