Commit Graph

60 Commits

Author SHA1 Message Date
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
Siana Gearz
f30c284063 Merge branch 'V2Mesh' of https://github.com/Shyotl/SingularityViewer into future
Conflicts:
	indra/llvfs/lldiriterator.cpp
	indra/newview/app_settings/settings.xml
	indra/newview/llviewerregion.cpp
2011-07-21 00:20:06 +02:00
Shyotl
4753d65076 V2 llvfs merge 2011-07-13 03:53:12 -05:00
Aleric Inglewood
5bf3647f46 Better way to test on BOOST_FILESYSTEM_VERSION
This way it also compiles with older versions that
don't define BOOST_FILESYSTEM_VERSION (ie, 1.42).
2011-06-30 03:05:07 +02:00
Aleric Inglewood
9a224f2b5c Fix to problems with regex characters in group names.
Stolen from
https://bitbucket.org/squire_linden/viewer-dev-chop-662/changeset/6f971899f351
2011-06-22 01:22:52 +02:00
Aleric Inglewood
5d87098bd0 Port Viewer 2 indra/llvfs
This introduces some API changes, like the new LLDirIterator,
that causes changes elsewhere.

It also include Log Linden's cache changes that aren't in
viewer-development yet that increase the maximum cache size
to ~10 GB.
2011-06-06 21:38:58 +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
Aleric Inglewood
e0b0fa4f58 Use AIFilePicker everywhere.
Also upgrade the file picker filters with the new extensions found
in the orginal file picker code of Singularity.

Also improve AIFilePicker a bit: added hasFilename() and now
deleting the statemachine automatically by default: it's no longer
needed to call deleteMe from the callback.
2011-05-10 04:27:57 +02:00
Siana Gearz
e2e576e550 Merge git://github.com/AlericInglewood/SingularityViewer
Conflicts:
	indra/newview/skins/default/xui/en-us/mime_types.xml
2011-05-08 19:39:32 +02:00
Shyotl
8cc6092a1c A few variables were uninitialized.
Removed an unused variable.
Phys controller that should be female-only... wasn't.
Pre increment iterators when possible.
protected->private upgrades.
2011-05-04 19:54:03 -05:00
Aleric Inglewood
4d932d5e2d Added a thread-safe and robust wrapper for APR pools.
See http://redmine.imprudenceviewer.org/issues/590
and https://jira.secondlife.com/browse/SNOW-596
2011-05-05 02:52:55 +02:00
Aleric Inglewood
f2199a504b More various small, old patches.
Updated source tree to include everything I did
up till 2010-11-09.

Still to add: IMP-590, IMP-701, IMP-734, IMP-735 and IMP-702.
2011-05-04 19:48:16 +02:00
Aleric Inglewood
ab5915c16c LindenUserDir fixes.
Patch from 2010-10-20/22. Didn't apply cleanly so I redid it
manually and tested/checked it. There was only one difference
with imprudence: for some reason Singularity tries to see
if the "teleport history" floater is visible while initializing
the menu's, something that imprudence doesn't do. For the rest
the patch is basically the same. Nevertheless, I left all code
exactly as it was in Singularity (the only thing that this
commit changes is the intend of the original patch: in debug
mode, fail with an assertion when LindenUserDir is called while
it is not initialized; and then fix everything to make it work
again.

Original commit message:

The LindenUserDir (~/.imprudence/first_last/) cannot be initialized
before the user logged in. However, several singletons (that only can be
initialized once) depend on this directory for initialization. Therefore
we have to take care not to instantiate those singletons until after the
user logged in.

With regard to webit, this fixes the browser_profile (cache and cookies)
directory that the builtin browser uses.
2011-05-04 17:54:57 +02:00
Aleric Inglewood
6848c2df6f Fix underlinkage of libmedia_plugin_webkit.so
Fixed by updating indra/cmake/WebKitLibPlugin.cmake with
version from imprudence.

This commit also contains removal of execute permissions
of source files and configure files, sorry...
2011-05-02 23:13:15 +02:00
tmac@latestevidence.com
af203533b3 Spell check added 2011-04-23 18:08:59 -04:00
Siana Gearz
b92dec7530 How about i read before i commit? Fixes PerAccount dir 2011-04-01 20:50:44 +02:00
Siana Gearz
b3593f0ffe Proper per-account settings 2011-04-01 05:13:52 +02:00
Shyotl
18af6baedd Cleaned up a few minor things 2011-03-27 18:50:04 -05:00
Shyotl
8c0fb1261c Now using a buffer for debug console output. No longer bog-slow on windows if the console is enabled. 2011-02-28 01:38:05 -06:00
Siana Gearz
d97f87b05f Grid currency, partial 2011-02-11 22:37:52 +01:00
Siana Gearz
df509a363c mac SLPlugin search path 2011-02-06 00:37:04 +01:00