Aura Linden
|
a1d0268893
|
Minor improvement to identifying gl lib to use. Should use xcode version.
|
2012-07-24 16:52:33 -07:00 |
|
Aura Linden
|
ed4b379067
|
Eliminated countFilesInDir boostified getCurPath for OSX
|
2012-07-24 12:11:20 -07:00 |
|
Aura Linden
|
629ae69793
|
Make build dependent on version of xcode, not version of OSX for DARWIN
|
2012-07-23 13:09:26 -07:00 |
|
Aura Linden
|
5624f03b9c
|
Changed CMake to work for older and newer versions of OSX
|
2012-07-23 12:34:02 -07:00 |
|
Aura Linden
|
d2e67d0c0b
|
cmake changes for OSX 10.7
|
2012-07-18 19:01:19 -07:00 |
|
Aura Linden
|
35eda06ae4
|
llglheader include change for building on Lion
|
2012-07-18 17:35:10 -07:00 |
|
Oz Linden
|
c3d1ed5b76
|
merge back fixes from 3.3.4-beta5
|
2012-07-18 05:52:01 -07:00 |
|
Oz Linden
|
9643dee27e
|
Added tag 3.3.4-beta5 for changeset ab2ffc547c8a
|
2012-07-18 05:41:55 -07:00 |
|
Oz Linden
|
f26dfe4fb9
|
merge changes for DRTVWR-184
|
2012-07-18 03:10:25 -04:00 |
|
Oz Linden
|
a93cb07df6
|
tag merge of DRTVWR-184
|
2012-07-18 03:09:09 -04:00 |
|
Dave Parks
|
636e20be10
|
MAINT-1223 More aggressive rebuilding of render batches when alpha color values change.
|
2012-07-17 13:00:33 -05:00 |
|
Oz Linden
|
3803a5b5ae
|
pull back fixes for 3.3.4-beta4
|
2012-07-17 13:21:36 -04:00 |
|
Oz Linden
|
c906d64004
|
Added tag 3.3.4-beta4 for changeset 6c75f220b103
|
2012-07-17 13:18:12 -04:00 |
|
Oz Linden
|
e49faf96aa
|
merge changes for DRTVWR-183
|
2012-07-17 12:16:37 -04:00 |
|
Oz Linden
|
291be17078
|
tag merge of DRTVWR-183
|
2012-07-17 12:16:22 -04:00 |
|
Dave Parks
|
ccac47c1a7
|
MAINT-1223 Fix for alpha updates not triggering LoD updates.
|
2012-07-16 14:31:15 -05:00 |
|
Oz Linden
|
509408f393
|
merge back beta fixes for DRTVWR-180
|
2012-07-14 09:30:09 -04:00 |
|
Oz Linden
|
a4df79bcdc
|
tag merge of DRTVWR-180
|
2012-07-14 08:50:13 -04:00 |
|
Oz Linden
|
c3d9f0e41c
|
merge changes for DRTVWR-179
|
2012-07-13 13:04:16 -04:00 |
|
Oz Linden
|
e51a60536d
|
tag merge of DRTVWR-179
|
2012-07-13 13:03:50 -04:00 |
|
Dave Parks
|
f5254d532b
|
MAINT-1262 Fix for crash when setting graphics to Low
|
2012-07-12 16:53:31 -05:00 |
|
simon@Simon-PC.lindenlab.com
|
56d563ba7f
|
Fix merge issues - duplicate insertions of code
|
2012-07-11 17:14:25 -07:00 |
|
simon@Simon-PC.lindenlab.com
|
173d0fa213
|
Pull in viewer-development because it's painful. Merge with runitai's help.
|
2012-07-11 16:15:23 -07:00 |
|
Dave Parks
|
997b360747
|
MAINT-794 Fix for assert on loading some types of objects before their parents.
|
2012-07-11 15:17:13 -05:00 |
|
Oz Linden
|
254c270363
|
merge changes for DRTVWR-175
|
2012-07-09 16:16:12 -04:00 |
|
Oz Linden
|
2a34148e20
|
tag merge of DRTVWR-175
|
2012-07-09 16:14:35 -04:00 |
|
Oz Linden
|
06bb4a832a
|
correct dos line endings
|
2012-07-09 16:14:00 -04:00 |
|
Oz Linden
|
5a563069e8
|
merge back more late beta fixes from 3.3.4
|
2012-07-09 12:45:22 -04:00 |
|
Oz Linden
|
f7f27e4f26
|
Added tag 3.3.4-beta3 for changeset a8057e1b9a12
|
2012-07-09 12:42:16 -04:00 |
|
Oz Linden
|
690f985a9c
|
merge changes for DRTVWR-177
|
2012-07-09 11:41:47 -04:00 |
|
Oz Linden
|
1b109f80b9
|
tag merge of DRTVWR-177
|
2012-07-09 11:41:22 -04:00 |
|
Oz Linden
|
9298b1abe9
|
merge changes for DRTVWR-176
|
2012-07-08 18:36:15 -04:00 |
|
Oz Linden
|
ed21e67a38
|
merge changes for DRTVWR-176
|
2012-07-08 17:21:06 -04:00 |
|
Oz Linden
|
13f7afbd7d
|
merge changes for DRTVWR-176
|
2012-07-08 16:39:54 -04:00 |
|
Oz Linden
|
02bb54273f
|
tag merge of DRTVWR-176
|
2012-07-08 16:39:03 -04:00 |
|
callum
|
51f740ca8d
|
MAINT-1228 FIX Can not put more than one object into the contents of an object
Reviewed by Paul PE
|
2012-07-06 11:31:37 -07:00 |
|
eli
|
f0fd5525d7
|
FIX INTL-99 set32 translation for 8 languages
|
2012-07-03 12:38:47 -07:00 |
|
Oz Linden
|
ed5b46c9b0
|
merge back changes from 3.3.4-beta2
|
2012-07-02 12:38:07 -04:00 |
|
Oz Linden
|
9b1208e495
|
disable alignment tests in debug builds (where they fail)
|
2012-07-02 10:18:38 -04:00 |
|
Oz Linden
|
077e851bdd
|
Added tag 3.3.4-beta2 for changeset 82b5330bc8b1
|
2012-06-30 06:12:06 -04:00 |
|
simon@Simon-PC.lindenlab.com
|
08c6c5b78d
|
Added test back in, skip() call need to be removed.
|
2012-06-29 14:30:44 -07:00 |
|
Oz Linden
|
0fff60b3c9
|
merge changes for DRTVWR-174
|
2012-06-29 16:24:16 -04:00 |
|
Oz Linden
|
a49a47def6
|
tag merge of DRTVWR-174
|
2012-06-29 16:24:04 -04:00 |
|
Oz Linden
|
595b49b938
|
merge changes for DRTVWR-173
|
2012-06-29 16:15:24 -04:00 |
|
Oz Linden
|
a6b5b4322c
|
tag merge of DRTVWR-173
|
2012-06-29 16:15:11 -04:00 |
|
callum
|
11686a0917
|
Merge with viewer-beta
|
2012-06-29 10:36:04 -07:00 |
|
Oz Linden
|
326634e1bf
|
Added tag 3.3.4-beta1 for changeset f91d003091a6
|
2012-06-28 15:41:09 -04:00 |
|
Dave Parks
|
db5d1b851a
|
merge
|
2012-06-28 13:50:35 -05:00 |
|
Dave Parks
|
ed72fd0ae9
|
merge
|
2012-06-28 13:22:04 -05:00 |
|
Dave Parks
|
7f38f620fd
|
MAINT-1204 Fix for crash on selecting a texture anywhere other than the build tools.
|
2012-06-27 17:16:59 -05:00 |