unknown
25190a6d8a
Merge remote branch 'Ascent/master'
...
Conflicts:
indra/llaudio/llaudioengine.cpp
indra/llcommon/llqueuedthread.cpp
indra/llimage/llimage.cpp
indra/llimage/llimagepng.cpp
indra/llimage/llimagepng.h
indra/llimagej2coj/llimagej2coj.cpp
indra/llrender/llimagegl.cpp
indra/llrender/llrender.cpp
indra/newview/ascentprefssys.cpp
indra/newview/ascentprefsvan.cpp
indra/newview/gpu_table.txt
indra/newview/llfloaterauction.cpp
indra/newview/llsavedsettingsglue.cpp
indra/newview/llsavedsettingsglue.h
indra/newview/llstartup.cpp
indra/newview/llviewercontrol.cpp
indra/newview/llviewercontrol.h
indra/newview/llvoavatar.cpp
indra/newview/pipeline.cpp
indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
2010-10-11 07:01:10 -05:00
November
49aee73aea
Fixing GCC 4.0 build issue. Thanks again, Shyotl!
2010-10-04 23:38:00 -07:00
unknown
2a584cb0fd
Happy now, GCC?
2010-10-05 01:33:35 -05:00
CharleyLevenque
89f23eb868
Bunch of fixes from Shyotl
2010-10-02 17:10:46 -04:00
unknown
7b409eb7ab
-Enabled multi-processor compiling with Visual Studio
...
-Fixed refrences to secondlife-bin.exe in build scripts
-Added ability to blacklist sounds through Sound Explorer floater.
-Added a missing color to the silver skin
2010-09-30 00:45:34 -05:00
Beeks
5ce4286fd7
f
2010-08-22 15:14:30 -04:00
phr0z3nt04st
9e14b03165
Added ability to save scripts from objects from File -> Save as... and merged fixes for Unix systems, new detection for viewer 2.0
2010-07-20 21:44:16 -05:00
phr0z3nt04st
82aef8fa4c
Massive commit, beefed up the audio crash prevention, made a blacklist for assets, added sound explorer, fixed import, added item button to vfs explorer.
...
JELLY ROLL
2010-07-08 00:20:37 -05:00
Hazim Gazov
7a86d01598
Imported existing code
2010-04-02 02:48:44 -03:00
