Commit Graph

130 Commits

Author SHA1 Message Date
Shyotl
7e0ee6bb71 Shiny new name cache. 2011-07-15 00:21:38 -05:00
Shyotl
ce064f5af2 Some safe merging with v2. 2011-07-14 01:35:15 -05:00
Shyotl
459f00ccb8 LLVOCache class implemented. 2011-07-13 04:35:38 -05:00
Siana Gearz
6348635d3f Ïntroduced LLFolderType and LLViewerAssetType (by Shyotl) 2011-06-23 21:11:52 +02:00
Siana Gearz
839418991e Version 1.5.9(1) 2011-06-19 00:41:56 +02:00
Shyotl
6b033b78f5 Added OS detection for Windows Server 2008, Windows Server 2012(beta), and Windows 8(beta). 2011-06-16 21:02:07 -05:00
Aleric Inglewood
a8d71f2550 Merge remote-tracking branch 'origin/master' 2011-06-14 16:02:43 +02:00
Siana Gearz
b64bd9c74f Linux build fixes 2011-06-09 17:37:57 +02:00
Shyotl
858f4d1487 Fasttimer was using incorrect clock count precision. 2011-06-08 23:11:41 -05:00
Shyotl
b691e2b286 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git 2011-06-08 14:19:43 -05:00
Shyotl
9746f7cc27 Added lldeleteutils.h to llcommon/CMakeLists.txt 2011-06-07 22:42:34 -05:00
Shyotl
a07e399801 LLAgentCamera transition (1/2) 2011-06-07 21:35:10 -05:00
Aleric Inglewood
fed8951e00 Merge remote-tracking branch 'shyotl/V2Renderer' into V2Renderer 2011-06-03 22:48:23 +02:00
Shyotl
a1942ebc94 Bulldozed llprocessor. Make sure this doesn't explode on linux or mac. May be missing system headers on those systems. Not sure if carbon.h is needed for mac. 2011-05-30 01:35:44 -05:00
Shyotl
71eec1caed Improved error handling (introduced debugsession commandline argument). Startup/shutdown now more verbose. SSE checks if project was compiled with SSE(2)... not sure if windows would reach it if hardware lacked support, but linux/mac may (from V2). Fixed Mac crashes in deferred. 2011-05-28 01:46:11 -05:00
Shyotl
4ee4d52b2f Added bokeh DoF. Fixed some several SSAO and shadow combinations. Fixed GI crash bug. Enabled several fasttimers. Updated shaders. 2011-05-24 20:31:17 -05:00
Aleric Inglewood
d27abe5ed8 Merge remote-tracking branch 'shyotl/V2Renderer' into V2Renderer 2011-05-24 18:10:21 +02:00
Aleric Inglewood
8ee4ed96b7 Merge branch 'master' of https://github.com/siana/SingularityViewer
Resolved Conflicts:
	indra/llcommon/aithreadsafe.h

Manually added patch had trailing space more.
2011-05-22 22:42:24 +02:00
Aleric Inglewood
13560e292e Added AIFetchInventoryFolder and more.
Added a new statemachine AIFetchInventoryFolder, which can be used
to fetch the contents of a folder by name or UUID.

Also added AIEvent (and one event,
AIEvent::LLInventoryModel_mIsAgentInvUsable_true, which is needed
for AIFetchInventoryFolder).

Fixed LLInventoryModel::sBackgroundFetchActive to correctly reflect
whether or not LLInventoryModel::backgroundFetch is added to
gIdleCallbacks.

Avoid duplicated entries in sFetchQueue.

Reset sFullFetchStarted in LLInventoryModel::stopBackgroundFetch to
allow for a renewed full fetch when some single-folder fetch stops it.

Added AIStateMachine::mQueued to make calling 'cont()' more robust:
calling cont() / idle() / cont() on a row would otherwise add a
statemachine twice to the active list, which would cause a crash
when it's killed.
2011-05-22 22:01:11 +02:00
Shyotl
77f09744ab Merge branch 'AlericMaster' into V2Renderer
Conflicts:
	indra/llcommon/aithreadsafe.h
	indra/newview/pipeline.cpp
2011-05-20 12:56:23 -05:00
Shyotl
dff4e97c80 Merge branch 'master' into V2Renderer 2011-05-20 12:38:53 -05:00
Shyotl
cf6668cb7a Merge branch 'master' of git://github.com/siana/SingularityViewer.git 2011-05-20 12:38:36 -05:00
Shyotl
5f6fc78706 llmath and llcommon updates. Marginal. 2011-05-18 14:36:05 -05:00
Shyotl
b314172533 Merge branch 'master' into V2Renderer 2011-05-17 16:39:43 -05:00
Shyotl
1a2d75fbe6 LLStringOps, LLStringUtilBase, and LLDate updated to V2. If dates go wonky this is where it's from 2011-05-15 22:50:56 -05:00
Shyotl
fe372028dc Shuffled LL_COMMON_API around in spots to match v2
Added llformat_to_utf8
Added LLProcessLauncher::getExecutable()
LLStringTableEntry() ctor and dtor definitions moved from .h to .cpp
(should be safe)
2011-05-15 22:47:23 -05:00
Shyotl
51338470b5 Pulled LLEventTimer out of lltimer.h/cpp and into lleventtimer.h/cpp
LLInstanceTracker added to llcommon (pulled from llui in v2 for usage elsewhere)
LLEventTimer now using LLInstanceTracker
Updated LLLiveAppConfig (Though it appears unused, really)
processor.h is obsolete, thus removed. (llprocessor.h replaces it)
2011-05-15 22:40:59 -05:00
Shyotl
37c5016c2f LLAssetType lookup now done through LLDictionary. 2011-05-15 22:17:15 -05:00
Siana Gearz
adeba18356 GCC 4.6 fixes 2011-05-16 01:37:00 +02:00
Siana Gearz
bd153fc68f Public Thread Safety notice:
<add a cheesy cooment here>
2011-05-15 14:24:15 +02:00
Shyotl
461ddb2ca9 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git 2011-05-14 22:31:35 -05:00
Shyotl
3926d2d30a Resolved most errors under vc100 compiler 2011-05-14 22:30:30 -05:00
Aleric Inglewood
4e68f5878a Add missing AIReadAccessConst initialization of mIsCopyConstructed 2011-05-15 05:03:34 +02:00
Aleric Inglewood
2d648c1da0 Workaround for windows compiler bug.
Visual C++ compiler doesn't like to take a pointer to a variable
in the argument list of that variable when it is being declared.
2011-05-14 23:43:19 +02:00
Shyotl
66c9e3e1b4 Merge branch 'master' into V2Renderer
Conflicts:
	indra/newview/llvoavatar.h
2011-05-14 14:03:25 -05:00
Siana Gearz
32594cd651 Version 1.5.8(1) 2011-05-14 03:27:08 +02:00
Aleric Inglewood
41f13dbf46 Merge branch 'master' of https://github.com/siana/SingularityViewer
Added missing header to indra/newview/ascentkeyword.cpp now that
llviewerpluginmanager.h has a couple of header dependencies less.

Resolved Conflicts:
	indra/llcommon/CMakeLists.txt

Proximity: addition of two independent things. Just included both.
2011-05-14 01:06:19 +02:00
Aleric Inglewood
ea2cc3e0de Make FilePicker context sensitive default paths persistent over logins.
Also, make newview/statemachine a separate project.
2011-05-13 23:50:56 +02:00
Siana Gearz
ea31271ac1 Version 1.5.8 2011-05-13 20:27:34 +02:00
Siana Gearz
5aa145cc02 Merge git://github.com/narv/SingularityViewer 2011-05-13 13:26:33 +02:00
Shyotl
632a0b3e1f Merge branch 'master' into V2Renderer 2011-05-12 19:29:20 -05:00
Aleric Inglewood
3774547367 Redo the copyconstructor hack for AI*Access objects.
The previous hack wasn't thread-safe: read-only access would
access the reference counter multiple times at the same time,
which therefore would have to be thread-local to ever work.

The current solution just disables the calls to lock/unlock
for copyconstructed objects, which works if the copyconstructed
object isn't used anymore after the original is destructed.
This is the case then the copy construction only happens
upon passing a temporary to a function, which is the case.
2011-05-13 00:37:47 +02:00
narv
ebe7053526 Version 1.5.7(2) 2011-05-12 07:50:34 -07:00
narv
981e4f39b2 Revert to build llcommon on Darwin 2011-05-12 07:41:49 -07:00
Shyotl
d1d6994419 Full v2.6 renderer. 2011-05-12 00:13:38 -05:00
Siana Gearz
6b61e2dd2a Fix linkage in debug build on Windows 2011-05-11 12:47:24 +02:00
Aleric Inglewood
38b33328e6 Redo the copyconstructor hack for AI*Access objects.
The previous hack wasn't thread-safe: read-only access would
access the reference counter multiple times at the same time,
which therefore would have to be thread-local to ever work.

The current solution just disables the calls to lock/unlock
for copyconstructed objects, which works if the copyconstructed
object isn't used anymore after the original is destructed.
This is the case then the copy construction only happens
upon passing a temporary to a function, which is the case.
2011-05-11 03:47:42 +02:00
Siana Gearz
b81cfb2c4f Version 1.5.7(1) 2011-05-10 14:51:27 +02:00
Aleric Inglewood
fa51d52578 Workaround for gcc 4.2.x.
g++ 4.2 (and possibly earlier) apparently call a copy
constructor when passing a temporary to a function
that takes a const reference. Added code to allow
copy-constructing the AI*Access classes for this
compiler.

g++-4.2.x also bails out when it encounters files that
do not end on a newline. So, also added those where
they were missing.
2011-05-10 13:47:17 +02:00
Aleric Inglewood
133391be90 Merge branch 'master' of https://github.com/siana/SingularityViewer
Resolved Conflicts:
	indra/newview/llviewermedia.cpp
	indra/plugins/base_media/CMakeLists.txt

Trivial fix for indra/newview/llviewermedia.cpp.
Moved 'prepare' dependency from base_media to
base_basic because media already depends on basic.
2011-05-10 04:46:58 +02:00