Commit Graph

25564 Commits (5030766cf2b16a6ae64c8cec712b3bf9c3cddd9b)

Author SHA1 Message Date
Sovereign Engineer 5030766cf2 Correct order of autobuild libs 2013-02-04 21:36:12 +08:00
Sovereign Engineer 3ea6112843 Dos2Unix Line endings 2013-02-04 08:30:42 -05:00
Sovereign Engineer 8cf1d6af0d fmodwrapper uneeded with fmodex 2013-02-04 08:24:35 -05:00
Sovereign Engineer bc161b040a Remove FMOD 3.75 leftovers 2013-02-04 08:21:19 -05:00
Drake Arconis 800dad3123 Merged callum_linden/viewer-development-usb-headset into default 2013-02-02 10:57:35 -05:00
Graham Madarasz (Graham Linden) d6130d68d5 Updated fmodex download paths / md5sums from proxy for the first TC builds 2013-02-02 00:23:08 -08:00
Graham Madarasz (Graham) 3822600e27 Added copy of libfmodex .so for linux 2013-02-01 09:33:57 -08:00
callum_linden b0f2f02333 Removed (most) references to older FMOD library - still a little Linux clean up left 2013-02-01 08:44:52 -08:00
callum_linden 9b86b8bf3d Add in Windows FMOD Ex package 2013-01-23 15:57:38 -08:00
callum_linden e503acf7b8 Fix llaudio CMake file to not use FMOD - only FMODEX 2013-01-23 13:28:54 -08:00
callum_linden fa12377b0d Update 3p libs to include debug version too 2013-01-22 15:55:31 -08:00
callum_linden ba3e89b5c7 first push - patch from CmdCupCake plus force FMODEX on 2013-01-18 16:43:19 -08:00
Oz Linden cb67667533 increment viewer version to 3.4.6 2013-01-10 21:06:16 -05:00
Oz Linden 33734be9f3 Added tag 3.4.5-beta1 for changeset 40a2265058ab 2013-01-10 21:04:33 -05:00
Oz Linden fca9b86733 merge changes for DRTVWR-280 2013-01-10 16:56:06 -05:00
Oz Linden c36d3ea291 tag merge of DRTVWR-280 2013-01-10 16:56:02 -05:00
Oz Linden f3b362a6d4 merge changes for DRTVWR-279 2013-01-10 14:42:41 -05:00
Oz Linden bc522d6ba2 tag merge of DRTVWR-279 2013-01-10 14:42:36 -05:00
Oz Linden 9c94cf4e59 pull back release tag for 3.4.4 2013-01-10 14:35:21 -05:00
Kelly Washington 4cbef6d928 MAINT-2209 Parcel name not updating after teleport 2013-01-10 09:46:41 -08:00
Baker Linden c4a1bd1c2f viewer-development merge 2013-01-09 15:25:06 -08:00
Baker Linden b0c449d301 [MAINT-2185] Unable to upload terrain .raw files
- Fixed an issue where a slash was prepended to the beginning of the filename (which happened to be the full path)
2013-01-09 15:24:27 -08:00
Oz Linden d16757545c Added tag 3.4.4-release for changeset e1bb1ae7d8b1 2013-01-09 18:19:24 -05:00
Oz Linden cdd45b9abb merge changes for DRTVWR-276 2013-01-09 15:18:20 -05:00
Oz Linden 42a33b6c62 tag merge of DRTVWR-276 2013-01-09 15:18:10 -05:00
Dave Parks 4a84c7c8e5 More merge cleanup. 2013-01-09 13:20:41 -06:00
Dave Parks 971e9bd203 More merge cleanup. 2013-01-09 12:41:57 -06:00
Dave Parks dda41e3458 Merge cleanup. 2013-01-09 12:08:31 -06:00
Oz Linden bf55755262 merge changes for DRTVWR-277 2013-01-08 14:41:49 -05:00
Dave Parks 954ebaed84 Automated merge with https://bitbucket.org/lindenlab/viewer-tiger 2013-01-08 13:40:59 -06:00
Oz Linden 78f63524ab tag merge of DRTVWR-277 2013-01-08 14:29:25 -05:00
Oz Linden b601bc3cbf remove duplicated return (merge artifact) 2013-01-08 11:24:33 -05:00
Oz Linden a7dbaaa0af merge changes for DRTVWR-250 2013-01-08 09:45:27 -05:00
Oz Linden 77abdd04a4 tag merge of DRTVWR-250 2013-01-08 09:34:12 -05:00
eli b0d3975818 FIX INTL-110 remove utf8 BOM 2013-01-07 17:10:37 -08:00
eli 1f4f028044 FIX INTL-110 fix corrupted chinese character in translation 2013-01-07 17:06:28 -08:00
Oz Linden 0d12d171cf pull back 3.4.4-beta4 tag 2013-01-04 14:15:08 -05:00
Oz Linden fde976cf2b Added tag 3.4.4-beta4 for changeset 05d9f1dd7a95 2013-01-04 14:09:03 -05:00
Oz Linden 02d9734c45 merge back DRTVWR-275 from 3.4.4 beta 2013-01-04 10:12:04 -05:00
Oz Linden def472b45c tag merge of DRTVWR-275 2013-01-03 18:12:29 -05:00
Kelly Washington 2cba564b24 MAINT-2184 [crashhunters] new crash in LLUUID::toString
Fix dangling references.
2013-01-03 09:17:25 -08:00
Oz Linden cd1871d2e3 merge changes for DRTVWR-269 2013-01-02 10:15:33 -05:00
Oz Linden 55dfff68d4 tag merge of DRTVWR-269 2013-01-02 10:15:28 -05:00
Oz Linden 8c8d5ef924 merge changes for DRTVWR-272 2012-12-28 09:43:55 -05:00
Oz Linden 332eec9b70 tag merge of DRTVWR-272 2012-12-28 09:43:51 -05:00
Oz Linden 45492b81a0 merge changes for new Havok license 2012-12-27 13:45:17 -05:00
Oz Linden 835660bbb2 merge changes for DRTVWR-273 2012-12-25 09:00:49 -05:00
Oz Linden 4364924ee4 tag merge of DRTVWR-273 2012-12-25 09:00:42 -05:00
Oz Linden b003ed1fd7 merge accidental commit and its fix 2012-12-21 11:28:16 -05:00
Nat Goodspeed 36f094d508 MAINT-2168: Backed out changeset fb93eecd462d, reapply fix
Now that we've backed out the premature push, reapply the actual fix to
propagate it appropriately.
2012-12-21 09:03:06 -05:00