Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
2,786 Commits 20 Branches 51 Tags
e767392b443cf0bece33b9cceb88c6b37e7b8a9c
Commit Graph

2786 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Drake Arconis
e767392b44 Merge remote-tracking branch 'shyotl/future' into AltCompilers 
Conflicts:
	indra/llrender/llrendertarget.cpp
	indra/newview/llvovolume.cpp
 2012-08-08 18:54:04 -04:00
Drake Arconis
457177905d Merge remote-tracking branch 'singularity/master' into AltCompilers 2012-08-08 18:50:03 -04:00
Siana Gearz
96a4e16a4b Don't feed empty, non-working callback to CURL 2012-08-07 18:21:36 +02:00
Drake Arconis
769a7b89d2 More Media Updates 
Further updated llviewermedia
 2012-08-03 23:14:03 -04:00
Shyotl
d2b13f515d Avoid several excessive per-frame LLView::getChildView calls by instead caching the results in postBuild. (Added CachedUICtrl, which is basically just a self-nulling pointer to not have to make ui ctors dirtier) 2012-08-03 20:51:53 -05:00
Shyotl
ef601d3345 Implemented a hash-map for first-level children of ui elements. First-level child lookups are prolificly abused on a per-frame basis, and a plain old loop with a string comparison each iteraton was somewhat of a hotspot. (The recursive loop after is even more expensive, however) 2012-08-03 13:20:26 -05:00
Shyotl
d9e5601e10 Manually vectorized some of the UI vertex operations. 2012-08-03 13:12:02 -05:00
Shyotl
c385133c84 Fixed noisemap not binding for the nightvision shader. 2012-08-03 13:10:16 -05:00
Drake Arconis
c90c8e0f4b OpenID 
Added support into client for openid
 2012-08-03 11:32:36 -04:00
Drake Arconis
af89351432 Cookies. 
Enabled use of the cookie store.
 2012-08-03 08:49:01 -04:00
Drake Arconis
fb81754880 STUPID TEMP FILES 2012-08-02 23:29:12 -04:00
Drake Arconis
dc5bfc1c41 Bit of cleanup 
More cleanup and updates to llcommon
Removed legacy code and files
 2012-08-02 23:19:07 -04:00
Drake Arconis
af2a49afa7 Fixed linux64 libpng copying 2012-08-02 05:39:02 -04:00
Drake Arconis
b151796e0e Updated LSL Funtions 
Updated the functions, constants, tooltips, etc for os,aa, and secondlife
 2012-08-02 05:38:23 -04:00
Drake Arconis
828b2c9bc0 Merge remote-tracking branch 'shyotl/master' into AltCompilers 2012-08-01 21:41:36 -04:00
Shyotl
1d1947c51a Reworked LLPostProcess and implemented FBO support (much faster if multiple post shaders are enabled, or need a lot of passes). 
Tweaked LLRenderTarget to support depth textures if FBO support is lacking.
Prefer LLRenderTarget::getFBO() over LLRenderTarget::sUseFBO when determining how to handle a specific LLRenderTarget object. (Decoupling to simplify logic without having to track a global)
 2012-07-29 04:28:11 -05:00
Siana Gearz
6ed9a62501 Disable texture auditing at start-up 2012-07-28 16:56:19 +02:00
Shyotl
701230b49c Added LLRenderTarget::resize and did a little cleanup. 2012-07-26 03:05:22 -05:00
Shyotl
726d8248c5 Trying alpha-face rebuild using LL's method. 2012-07-26 00:17:38 -05:00
Shyotl
07a2c5a81d Use glFramebufferTexture2D to detach textures from FBOs before said textures are 'deleted'(set to NULL via zeroing dimensions). May avoid odd LLImageGL::deleteTextures crash on some apple systems. 2012-07-25 23:12:26 -05:00
Shyotl
081ae32d35 Disable diagnostic fmodex stream allocation overrides. (will break on ogg streams. badly.) 2012-07-25 23:08:37 -05:00
Shyotl
eeea2b4de4 Don't batch faces that are animating, ever (hopefully). Should fix texture animations breaking when rendermaxtextureindex > 1 2012-07-24 20:18:35 -05:00
Shyotl
21f6174846 Use glFramebufferTexture2D to detach textures from FBOs before said textures are 'deleted'(set to NULL via zeroing dimensions). May avoid odd LLImageGL::deleteTextures crash on some apple systems. 2012-07-24 11:27:23 -05:00
Siana Gearz
89be317a00 Fix measurement tool 2012-07-23 14:18:45 +02:00
Siana Gearz
1ad4597d7a Fix alpha flicker when Show Updates is enabled 2012-07-23 12:00:33 +02:00
Siana Gearz
c65b659538 Dirty potential mesh crash fix 2012-07-23 10:50:05 +02:00
Siana Gearz
3c23163a29 Less intrusive notifications, by Tazy Scientist 2012-07-23 09:54:00 +02:00
Siana Gearz
c3900ee4f3 Merge branch 'AltCompilers' of git://github.com/LightDrake/SingularityViewer 
Conflicts:
	indra/newview/llvieweraudio.cpp
 2012-07-23 09:03:17 +02:00
Siana Gearz
9c5da9e42c Build fixes VC10 2012-07-23 08:13:13 +02:00
Drake Arconis
efa970c6a5 Uhm.. 
This fixes a build issue temp till can rebuild QT...*sigh*
 2012-07-22 23:41:09 -04:00
Siana Gearz
179f04739d Merge commit 'c7bdaf66329b018159c834d75fcc3d807b188ccb' 2012-07-23 05:10:56 +02:00
Siana Gearz
b2f513caae Safer settings, EOL fix 2012-07-23 04:02:20 +02:00
Siana Gearz
9c1e74b0c0 Merge branch 'master' of git://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/llaudio/llstreamingaudio_fmodex.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_graphics1.xml
 2012-07-23 03:04:33 +02:00
Siana Gearz
e53af58d4a Merge branch 'master' of git://github.com/AlericInglewood/SingularityViewer 2012-07-22 23:31:19 +02:00
Siana Gearz
d9cb2ce6c7 Looks like a bit of edit crash fix got missed, thx Drake 2012-07-22 23:30:41 +02:00
Siana Gearz
a967f2b037 Updated 'Show Updates' 2012-07-22 22:36:40 +02:00
Siana Gearz
db5a7578c9 Crash fix copy texture params 2012-07-22 21:44:41 +02:00
Siana Gearz
15086833a3 Random stab in the dark coming right up! 2012-07-22 11:26:36 +02:00
Shyotl
32f407340f Call LLImageGL::initClass to avoid crash when calling LLFeatureManager::applyRecommendedSettings. (texauditing vectors must be allocated) 2012-07-21 21:16:41 -05:00
Aleric Inglewood
2830b35aa6 Avoid dead lock in LLQueuedThread::generateHandle / LLTextureFetchWorker::callbackDecoded 
Thead 1:

indra/llcommon/llqueuedthread.cpp:456:

452                     if (complete)
453                     {
454                             lockData();             // This locks LLThread::mRunCondition
455                             req->setStatus(STATUS_COMPLETE);
456                             req->finishRequest(true);

LLImageDecodeThread::ImageRequest::finishRequest calls:
    mResponder->completed(success, mDecodedImageRaw, mDecodedImageAux);

LLTextureFetchWorker::DecodeResponder::completed calls:
    worker->callbackDecoded(success, raw, aux);

LLTextureFetchWorker::callbackDecoded calls:
    LLMutexLock lock(&mWorkMutex);                      // This locks LLTextureFetchWorker::mWorkMutex

Thread 2:

LLTextureFetchWorker::doWork calls:
    LLMutexLock lock(&mWorkMutex);                      // This locks LLTextureFetchWorker::mWorkMutex
    .
    .
    .
    mDecodeHandle = mFetcher->mImageDecodeThread->decodeImage(mFormattedImage, image_priority, discard, mNeedsAux, new DecodeResponder(mFetcher, mID, this));

LLImageDecodeThread::decodeImage calls:
    handle_t handle = generateHandle();

LLQueuedThread::generateHandle calls:
    lockData();                                         // This locks LLThread::mRunCondition
 2012-07-22 04:13:23 +02:00
Shyotl
a1e714dce7 mDeferredVB only needs allocated when rendering in deferred mode. mCubeVB only needs allocated when occlusion is working. Let them be lazy-allocated on an as-needed basis. 2012-07-21 03:43:30 -05:00
Shyotl
3710ea903e Enable texture auditing categories, also fixed potential buffer underread related to auditing. 2012-07-21 03:27:43 -05:00
Drake Arconis
72a9b6b7fe Corrected issues 
Corrected issue noted in media_plugin_webkit by Aleric.
Grr.
 2012-07-21 03:23:02 -04:00
Drake Arconis
0d3fab40e5 Further header cleanup and a few updates 
Updated llstring to current linden
Further linden_common cleanup
Header cleanup
Raised banlines to 5000 as per linden server change
Included missing llmediaentry.cpp file
Minor whitespace changes here and there
 2012-07-21 03:01:42 -04:00
Shyotl
95abf3dca3 Merge branch 'master' into future 2012-07-20 12:12:07 -05:00
Shyotl
4e4d554ea4 Silence the diagnostic llinfos spam when listening to a stream. 2012-07-20 12:11:30 -05:00
Shyotl
9642780bb8 Merge branch 'master' into future 
Conflicts:
	indra/llaudio/llstreamingaudio_fmodex.cpp
	indra/llaudio/llstreamingaudio_fmodex.h
 2012-07-20 12:07:10 -05:00
Shyotl
73bc656e63 Flexis were not being reliably initialized before being drawn. 2012-07-20 12:04:24 -05:00
Shyotl
b8b235df09 And suddeny the texture index attrib(for batching) is now an integer! (Changing switch to an if block on nividia hardware seems like the real solution to pink textures... not the index datatype) 2012-07-20 12:03:41 -05:00
Shyotl
7b23aece00 Missed a couple LLCullResult::drawable_list_t -> LLCullResult::drawable_iterator replacements, albeit in #if'd out code blocks. 2012-07-20 11:37:01 -05:00