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

2551 Commits

Author SHA1 Message Date
Aleric Inglewood
cd93aba002 Created aistatemachine library and moved files. 2012-07-29 01:30:10 +02:00
Aleric Inglewood
fe38f59bbb Bug fix 2012-07-29 01:30:10 +02:00
Aleric Inglewood
ed4c6b7c92 Removed dead code. 
This code has been in the viewer source for a long time,
and hasn't been used for a long time (furtherest back that
I checked was Snowglobe 1.4).

Most notably, this removes LLContextURLExtractor and code
that used it because that required an API where AICurlEasyHandle
is created before an url is known, which gets in the way of
reusing connections.
 2012-07-23 18:15:11 +02:00
Aleric Inglewood
785729abdf Merge branch 'master' into curlthreading2 2012-07-22 04:17:34 +02: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
Aleric Inglewood
fb38f6adea Always write curl I/O debug info for the login attempt. 2012-07-21 21:51:24 +02:00
Aleric Inglewood
3a30f1dc71 This is called when LLApp::sStatus == LLApp::APP_STATUS_STOPPED too. 2012-07-21 03:57:58 +02:00
Aleric Inglewood
9e5cbf330f Bug fix for windows code found with previous commit. 2012-07-19 17:28:45 +02:00
Aleric Inglewood
2fa9334090 Debug code to test the windows code path on linux 2012-07-19 17:27:37 +02:00
Aleric Inglewood
fcdf5d377e Move PollSet out of the header file 2012-07-19 17:26:02 +02:00
Aleric Inglewood
051263117d Don't force TLS v1 unless needed and then warn about it. 2012-07-19 00:13:43 +02:00
Aleric Inglewood
f772cbee51 Don't crash upon exit if we fail to cleanup. 2012-07-18 03:13:33 +02:00
Aleric Inglewood
7f78870295 Merge remote-tracking branch 'siana/master' into curlthreading2 
Conflicts:
	indra/llcommon/llstring.cpp
	indra/llmessage/llcurl.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/viewer_manifest.py
	install.xml

Resolved:
	indra/llcommon/llstring.cpp :
		two different ways to work around compile error.
	indra/llmessage/llcurl.cpp :
		this file is no longer used.. I deleted huge
		parts to mark that I implemented that. Siana
		apparently made a few changes in those parts.
	indra/newview/llviewertexturelist.cpp :
		manually copied patch. Mine also removed trailing
		spaces, keeping that.
	indra/newview/viewer_manifest.py:
		Collision with changes from Liru, which have been
		ignored (kept siana/master).
	install.xml:
		Collision with an earlier screw up. I kept the
		fix from siana/master.
 2012-07-18 02:08:31 +02:00
Aleric Inglewood
706b9c55c2 Moving stuff around a bit... 2012-07-18 01:41:36 +02:00
Shyotl
48ae0d003d Made the Visual Studio compiler a bit more happy with aicurl. 2012-07-17 18:04:48 -05:00
Aleric Inglewood
0204d09a89 If curl thread is already awake, then don't write something to the pipe. 2012-07-17 23:39:44 +02:00
Aleric Inglewood
648ed00ce2 Don't call gSavedSettings.getU32() and calc_clock_frequency() so often anymore. 2012-07-17 19:58:34 +02:00
Aleric Inglewood
87c9358813 Add back erroneously removed comments. 2012-07-17 19:33:12 +02:00
Aleric Inglewood
64b968b262 process is no longer processing 2012-07-17 19:27:14 +02:00
Aleric Inglewood
900e533b4b Remove unused call to process(). 2012-07-17 08:01:06 +02:00
Aleric Inglewood
9deb3e433c LLCurlRequest time out fixes. 
Also some more cleanup on exit improvements.
 2012-07-16 22:35:04 +02:00
Siana Gearz
891a330955 Version 1.7.0 2012-07-16 12:19:22 +02:00
Aleric Inglewood
a34247ebf4 Bug fix. 
Don't test on something that belongs in an assert.
is_main_thread() doesn't even exist unless --type=Debug.
 2012-07-15 23:08:07 +02:00
Aleric Inglewood
53e96b02c0 Bug fix. Forgot to actually make it virtual. 2012-07-15 22:59:29 +02:00
Aleric Inglewood
7c022d6061 Don't crash on exit. 
When a new state machine was just created, so run() had already
been called but it never did really run yet so running() would
return false; then abort() wasn't called in flush(), causing
the subsequent mainloop call to actually try and startup the
state machine, which then crashed because Debug Settings
mechanism is already destroyed at that point (and in general,
we really don't want anything to run: it does unpredictable
things).

With this fix, also state machines that were just created are
aborted, resulting actuall in a kill without delete, and subsequently
a clean delete from the mainloop.
 2012-07-15 22:51:14 +02:00
Aleric Inglewood
14e5b46687 Fixed and adjusted remainders of isValid() code. 
Note that in the code, and still, has_curl_request was always false.
However, instead of deleting all code paths that are only executed
when has_curl_request would be true, I fixed the code to work as
intended with my current implementation; which also results in
LLCurlRequests to never expire. This way things won't break
unexpectedly when this ever changes.

Since on this branch isValid was only called still (the rest was
removed already) to check if the curl download expired, I took
the liberty to rename isValid to hasNotExpired.
 2012-07-15 22:46:38 +02:00
TighMacFanatic
329b708aaf Fix History button in IM panel not working for non-Windows users. 2012-07-15 15:07:05 -04:00
TighMacFanatic
56c85813ee Fix History button on local chat not working for non-Windows users. 2012-07-15 14:25:10 -04:00
Aleric Inglewood
a6bb2604f6 Use our API, which makes more sense. 2012-07-15 16:58:47 +02:00
Aleric Inglewood
b2c71c099f Fixed typo in comment 2012-07-15 16:57:47 +02:00
Siana Gearz
d5e685aaf2 Merge branch 'V2MultiWear' of https://github.com/Shyotl/SingularityViewer 2012-07-15 09:44:17 +02:00
Shyotl
08dd79fafd Recent occlusion changes rearing their head again. Fix a crash when graphics set to low. 2012-07-14 20:42:47 -05:00
Shyotl
fa9c366076 Fixed alpha textures not entering the alpha pool an alternative way. 2012-07-14 19:45:11 -05:00
Shyotl
08ab36a5d9 mPendingInventoryItemsIDs wasn't having entries removed. 2012-07-14 19:44:06 -05:00
Siana Gearz
c1c04b489c Revert "Possible fix for "No able to connect to SecondLife"" 
This reverts commit 66c95af093.
 2012-07-15 02:29:00 +02:00
Siana Gearz
0caa321fe5 Merge branch 'V2MultiWear' of git://github.com/AlericInglewood/SingularityViewer 2012-07-14 22:02:06 +02:00
Aleric Inglewood
66c95af093 Possible fix for "No able to connect to SecondLife" 2012-07-14 20:57:55 +02:00
Aleric Inglewood
9241816a71 Include linden_common.h first. Needed for libcwd. 2012-07-14 20:04:55 +02:00
Aleric Inglewood
7416d2aaf1 Timer, time out, and clean up improvements. 2012-07-14 04:29:37 +02:00
Siana Gearz
cb61342e58 Merge branch 'V2MultiWear' of https://github.com/Shyotl/SingularityViewer 2012-07-13 13:45:02 +02:00
Siana Gearz
d99de40b2b Suppress error prevalent on OSGrid 2012-07-13 13:44:46 +02:00
Shyotl
f8445030c7 Avoid making duplicate copies in item inventory when no-mod texture is dragged onto faces. 2012-07-12 16:33:05 -05:00
Shyotl
1d60131df7 Avoid switch statement in shaders on nvidia hardware, since some driver versions don't behave properly, apparently.. 2012-07-12 16:25:27 -05:00
Shyotl
539b6410fa Brought back the inventory item count display after loading has completed. 2012-07-12 16:09:42 -05:00
Lirusaito
75f067d5c9 Added crossfade checkbox to Windlight remote panel. 2012-07-12 13:35:56 -04:00
Lirusaito
518e9b7513 Merge branch 'master' of git://github.com/siana/SingularityViewer into V2MultiWear 2012-07-12 12:40:41 -04:00
Siana Gearz
0314bb4d38 Apparently Laika Tungsten's name is nhede Core 2012-07-12 18:34:49 +02:00
Siana Gearz
ddfe004204 Restore function of day cycle editor 2012-07-12 18:33:10 +02:00
Siana Gearz
07375e7a39 Merge branch 'V2MultiWear' of https://github.com/Shyotl/SingularityViewer 
Conflicts:
	indra/llrender/llvertexbuffer.h
 2012-07-12 08:30:35 +02:00
Lirusaito
44b69f3d3e Merge branch 'V2MultiWear' of git://github.com/Shyotl/SingularityViewer into V2MultiWear 
Conflicts:
	indra/llrender/llvertexbuffer.h Chose Shyotl's.
 2012-07-11 23:23:31 -04:00