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

80 Commits

Author SHA1 Message Date
Rye Mutt
8561af1f84 Add abseil hashmaps and use in texture list, also fix bugs in texture list insertion 2019-09-28 19:03:49 -04:00
Router Gray
9600965bcf Dullahan finally works, thanks Liru, Bitten, Drake. Catch Linux up. 2019-07-22 04:48:34 -05:00
Lirusaito
f2b39196a0 In dev checkouts, AppViewer now sets AppRoDataDir to newview 
Crossplatform, settings, windlights, skins, the works~
No more copying~ <3
 2019-03-26 02:23:51 -04:00
Lirusaito
acc6f6b3c3 Reapply ability to develop UI/skins without needing to copy files 2019-03-18 14:09:18 -04:00
Shyotl
f03249f5d5 Update manifest and lldir_linux to use new crt file. 2018-08-12 19:53:07 -05:00
Shyotl
bc8c95a7f7 Minor cleanup. 2018-08-10 18:17:30 -05:00
Shyotl
369a3ed909 Replace CA file. 2018-08-10 18:16:48 -05:00
Lirusaito
e8a0762eee Firestorm can't be trusted. 2017-05-13 09:56:23 -04:00
Shyotl
f4a713a500 Merge. 2017-03-14 04:02:53 -05:00
Shyotl
f89a5aaa27 Eups. Fix chatlog and user dir. 2016-05-03 01:54:50 -05:00
Lirusaito
f0a6ffcabf Hopefully fix the logs thing? 2016-05-02 19:32:15 -04:00
Lirusaito
a8062d732e Clean up upstream merge artifact 2016-05-02 15:17:06 -04:00
Shyotl
be5d2f20bc llrender and lldir merge. Removed duplicate assets from skins. cleaned up skin textures.xml files to only include changes from default. 2016-04-11 02:51:08 -05:00
Drake Arconis
2f2e1fbe8f Major breaking changes 2016-01-16 08:05:47 -05:00
Shyotl
1c627317ec No longer include llerrorlegacy.h. Updated llstl to include deletion utilites. 2015-06-19 03:54:20 -05:00
Inusaito Sayori
a7c424fc68 Fix remaining issues with new packaging system (mostly Linux) 
Thanks to Duncan Armundsen and Damian Zhaoying for the pointers
(merges slightly with alchemy)
 2015-01-27 12:08:46 -05:00
Cinder Biscuits
2db2c96329 Fix find evaluation on newer versions of clang (and 64-bit macs) 2014-09-07 22:43:03 -04:00
Shyotl
e975e389df Merge branch 'master' of https://github.com/singularity-viewer/SingularityViewer.git 
Conflicts:
	indra/newview/llnetmap.cpp
 2014-08-05 18:17:13 -05:00
Shyotl
815acfc7da Don't use SHGetSpecialFolderPath since it's dead. Use SHGetFolderPath instead, as that still is supported on XP, and is merely deprecated, not removed from newer SDKs (yet). 2014-07-04 20:25:35 -05:00
Inusaito Sayori
3cff5cd1a8 Only determine DumpDir in one place, LLDir::getDumpDir, not in llcrashlogger. 
Also spaces tabs in getDumpDir
 2014-06-11 14:36:41 -04:00
Inusaito Sayori
e46fc0a805 Portability Mode! 
Just add --portable to the shortcut
or use the provided shortcut as a template,
though it's likely the provided shortcut will not work on other computers, because the drive letter will change
 2014-06-09 00:00:43 -04:00
Lirusaito
861f88dd30 Awesomeness, yayayay! (allows XML changes in indra/newview/skins/ to count for viewer running from a directory in indra on Windows) 2014-04-15 20:06:08 -04:00
Latif Khalifa
3979ad46f6 Separate out the cache directory for windows 64 2013-10-24 10:24:18 +02:00
Latif Khalifa
26f4c4a773 Boost throws exceptions 2013-10-06 08:11:07 +02:00
Latif Khalifa
4118afc146 Boost upgrade to 1.52 2013-10-05 20:27:20 +02:00
Latif Khalifa
c8cb600ba6 Breakpad: workaround for boost crash on Linux 2013-10-02 02:59:40 +02:00
Latif Khalifa
81fa147450 Breakpad: don't fork logger process on startup. Use singularity-debug as the dir for dumps 2013-10-01 21:47:12 +02:00
Latif Khalifa
c87f7b0576 Breakpad3: WIP, minidump files created 
TODO: re-work sending crash logs
get rid of standalone loggers
 2013-10-01 13:43:45 +02:00
Shyotl
3fcc92ccad FOLDERID_LocalAppData should have been FOLDERID_RoamingAppData 2013-09-23 17:55:32 -05:00
Shyotl
55f43c5fcd Missed a SHGetSpecialFolderPath call. 2013-09-23 16:16:18 -05:00
Shyotl
0219186106 Use SHGetKnownFolderPath on vista/win7/win8, instead of deprecated SHGetSpecialFolderPath. 2013-07-03 17:16:37 -05:00
Shyotl
d4a545fb16 More WIP moap changes. Browser elements now function, added many required settings and notifications, and fixed some crashes and other bugs. 2013-06-01 05:11:18 -05:00
Shyotl
ef3e918558 Initial moap commit. /VERY/ WIP. Primarily committed to clean up unstaged changes. Do not run this, even if it may compile, as it will NOT work (for a myriad of reasons)! 2013-05-31 05:33:41 -05:00
Drake Arconis
43c0c4ce91 Some CMake Cleanup 
Clean up leftover SERVER and VIEWER from when they were a single tree
Fixed debian multiarch cmake
Small bits of OSX cleanup
 2013-03-04 03:31:24 -05:00
Shyotl
d71210e942 Trivial changes, mostly to clean up diff noise. Majority of changes are comment corrections or licenseinfo updates. (does not include newview directory) 2013-01-07 14:44:54 -06:00
Drake Arconis
86ad4aabf3 Cmake changes needed for standalone 2012-09-07 17:53:13 -04: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
Drake Arconis
ece9dda7b4 Initial support for the Clang compiler and numerous warning fixes 2012-07-02 19:45:41 +00:00
Lirusaito
a82953d0d0 Few more GCC 4.7 fixes. 
include unistd when not on windows.
 2012-04-29 00:25:40 -04:00
Aleric Inglewood
b755bcd495 Merge remote-tracking branch 'origin/master' 2012-02-01 03:35:10 +01:00
Aleric Inglewood
e7b2972fc8 LLVFile::readFile must return LLPrivateMemoryPool allocated data. 2012-02-01 03:33:39 +01:00
Siana Gearz
8899dbef3c Fix plug-ins not working when path >32 characters 2012-01-27 05:08:15 +01:00
Siana Gearz
3261332e0b ouch-i-feel-so-stupid build fix 2012-01-26 02:30:42 +01:00
Siana Gearz
6939d2d70b Build fixes 2012-01-25 23:45:18 +01:00
Shyotl
6374f012de new fasttimers, including ui. 2012-01-23 18:30:54 -06:00
Shyotl
30a95e7f45 Some cleanup. Using gAgentAvatarp in many places. Incl other misc small changes. 2011-10-03 22:45:13 -05:00
Shyotl
d917bf6b06 LLAPRFile cleaned up 2011-09-20 21:39:27 -05:00
Shyotl
36600462d1 Merge branch 'future' of git://github.com/siana/SingularityViewer.git into BatchIndexing 
Conflicts:
	indra/newview/hippopanelgrids.cpp
	indra/newview/llstartup.cpp
	indra/newview/llsurface.cpp
	indra/newview/llviewermessage.cpp
	indra/newview/llviewerparceloverlay.cpp
	indra/newview/llviewertexturelist.cpp
	indra/newview/llworld.cpp
 2011-09-09 16:53:12 -05:00
Shyotl
c129a1a923 Small LLVFS (LLDirIterator specifically) tweak regarding path existance detection. 2011-08-29 03:35:08 -05:00
Aleric Inglewood
dfa10281ea LLFrameTimer review and resulting changes. 
This makes the class API a bit more sane, although
only a bit, because I had to leave it working with
possibly new code merged in from LL: the API can't
really change. I also removed some unused code.

While reviewing how LLFrameTimer worked however,
I did find a few instances where things where broken:

* sFrameDeltaTime wasn't correctly updated (more
  than once per frame and therefore erratic). This
  only influenced scrolling speed, but still.
* While dragging an inventory item, the scroll
  arrows of a tab container didn't work
  (LLTabContainer::handleDragAndDrop).
* Map zoom interpolation was broken (it interpolated
  between A and B, but used the already updated
  interpolation for A the next frame...
  (added mCurZoomValInterpolationStart).
 2011-08-18 19:30:43 +02:00