Commit Graph

72 Commits

Author SHA1 Message Date
Shyotl
db2f409ef4 Preventing crash if shutting down while in login process. 2011-06-18 22:36:44 -05:00
Shyotl
6d9b7b14ad More llinfos output on client initilization. 2011-06-16 22:43:05 -05:00
Aleric Inglewood
a8d71f2550 Merge remote-tracking branch 'origin/master' 2011-06-14 16:02:43 +02:00
Siana Gearz
2bde195c77 Merge git://github.com/AlericInglewood/SingularityViewer
Conflicts:
	indra/cmake/Boost.cmake
2011-06-09 15:30:19 +02:00
Shyotl
c57b97c8df LLAgentWearables Transition (1/1) 2011-06-09 01:35:49 -05:00
Shyotl
b691e2b286 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git 2011-06-08 14:19:43 -05:00
Shyotl
a07e399801 LLAgentCamera transition (1/2) 2011-06-07 21:35:10 -05: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
Siana Gearz
630059a74f Merge git://github.com/AlericInglewood/SingularityViewer
Conflicts:
	indra/newview/llpaneldisplay.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_system.xml
2011-06-05 19:56:46 +02:00
Aleric Inglewood
55f1d00c3b Compiler error fix.
How can this every have compiled? Please don't push commits
without first at least compiling it :/

Using '#else if' instead of '#elif'?!

indra/newview/llappviewer.cpp:797:7: error: extra tokens at end of #else directive
2011-06-03 23:10:53 +02:00
Shyotl
fef7ce9f76 Updated LLSelectMgr 2011-05-30 19:56:00 -05:00
Shyotl
49b893c806 Removed most OGPX related code. 2011-05-28 17:11:10 -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
77f09744ab Merge branch 'AlericMaster' into V2Renderer
Conflicts:
	indra/llcommon/aithreadsafe.h
	indra/newview/pipeline.cpp
2011-05-20 12:56:23 -05:00
TighMacFanatic
2b412bffec Updated preferences system for bug fixes and user friendliness. 2011-05-17 12:54:30 -04:00
Aleric Inglewood
3656939269 Cancel pose stand when quitting.
This fixes the bug that if you Quit while in the Singularity -> Pose
Stand, then you are permanently hovering over the group until you go
into Advanced -> Debug Settings and reset AscentAvatarZModifier.

It also fixes that before, when you changed AscentAvatarZModifier
in Advanced -> Debug Settings then you saw no effect (until the
viewer would sent an AvatarAppearance message.

After this patch, changing any of the AscentAvatar*Modifier settings
has immediate visible effect, and a pose stand (Z-offset) is reset
when quitting.
2011-05-17 02:42:06 +02: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
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
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
7e16e0624a Scare everyone with a big-arsed warning. Horray! 2011-05-07 01:41:28 -05:00
Aleric Inglewood
92696623e0 Start up crash of LLErrorThread due to corrupt map in CheckLevelMap
Wrapped gSettings and the global objects returned by Settings::get() and
Globals::get() in AIThreadSafe, forcing thread-safe access.

This solves the problem of possible corruption of the various LevelMap's
in LLError::Settings due to thread unsafe accesses.
2011-05-05 15:41:19 +02: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
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
ccaa494e85 Updated doc/contributions.txt and added various missing patches from imprudence.
This updates the source tree with patches that I committed to
imprudence up till and including 2010-10-19.
2011-05-04 15:52:25 +02:00
Shyotl
8b12d794c5 Added physics saved settings.
Emerald physics demoted to legacy. Only enabled on av's that fail to send physics paramaters, or AvatarPhysics is completely disabled.
Params reset when AvatarPhysics is toggled off. (Bugfix for LL's code)
2011-04-28 22:47:48 -05:00
Shyotl
8ff0a29f9d Removed warning regarding 'RenderCubeMap' feature upon startup 2011-04-13 02:47:49 -05:00
Shyotl
497e63bfb6 Fixed scaling issues with non-power-of-two ui textures 2011-03-31 21:53:23 -05:00
Shyotl
e756140e1d Innitial commit of experimental v2 texture system port work. Compiles and runs on windows, at least. Fixing bugs as they come.
Need to test:
localassetbrowser
preview related floaters
hgfloatertexteditor
maps
media textures! Currently very hacky
web browser
alpha masks on avatars
bumpmaps
Are all sky components appearing?
LLViewerDynamicTexture (texture baking, browser, animated textures, anim previews, etc)
Snapshot related features
Customize avatar
vfs floater
UI textures in general
Texture priority issues
2011-03-31 03:22:01 -05:00
Shyotl
dc62c29af0 Extended win OS detection to include vista and win7 2011-03-27 18:56:30 -05:00
Shyotl
b887d3147e Merge branch 'master' of git://github.com/siana/SingularityViewer.git
Conflicts:
	indra/llrender/llglstates.h
2011-03-25 17:54:52 -05:00
Shyotl
f73c666f0e Added isAgentAvatarValid() helper function from v2
Nullchecks
Flight-state tweaks
2011-03-25 17:50:06 -05:00
Siana Gearz
86f7987e13 build fix, cleanup 2011-03-25 22:09:42 +01:00
siana
15c01ed310 Merge remote branch 'shyotl/V2Renderer'
Conflicts:
	indra/cmake/00-Common.cmake
2011-03-20 04:55:56 +01:00
siana
baac16b5d2 OpenJPEG experiment, PCH circumcision 2011-03-20 04:44:58 +01:00
Siana Gearz
7b98e5f2f1 OpenSim crash fixes, thx to Henri and Zauber 2011-03-15 15:26:48 +01:00
Shyotl
b06dcb45c0 Applying recent commits from Snowstorm 2011-03-15 01:15:43 -05:00
Shyotl
996aaf6345 V2 spatial partition, and all the pipeline changes that go with it.
Note: Deferred mode is not finished, and thus broken. Don't use!
2011-03-10 23:05:04 -06:00
Siana Gearz
754c70770a Ignore group chat, from Imprudence 2011-03-03 03:40:28 +01:00
Siana Gearz
8d85f67757 Imprudence AO 2011-03-01 04:16:54 +01:00
Siana Gearz
f7109a0131 Ripped out Inertia AO 2011-02-27 16:34:57 +01:00
Siana Gearz
d97f87b05f Grid currency, partial 2011-02-11 22:37:52 +01:00
Siana Gearz
2550e2b6f2 OpenGrid protocol is dead. byebye o/ 2011-01-31 19:59:28 +01:00
Siana Gearz
d962b05a9e Hippo Grid Manager 2011-01-29 18:23:56 +01:00
siana
d65a5ffeb7 Assorted DN and RLVa fixes from Phoenix 2011-01-02 02:05:32 +01:00
Siana Gearz
5fd5049e9b Henri's HTTP pipeline, with SG twist 2010-12-30 21:17:51 +01:00
Siana Gearz
f9dcb1bb09 RLVa 1.1.2 to 1.1.3 upgrade. InvLinks + COF 2010-11-25 23:47:11 +01:00
Siana Gearz
6866a36a5c Display names from Phoenix. Thanks Wolfspirit!
That's quite a piece of work. I have NO idea how Jess can downplay the
effort that went into this.

And it's still not complete, local chat is not affected, perhaps group
chat too.
2010-11-20 15:25:57 +01:00
Siana Gearz
d5fee73c42 Thickbrick's fixes 2010-11-18 20:22:11 +01:00
Siana Gearz
e6806f3b16 Branding pt2 2010-11-15 10:45:16 +01:00
Siana Gearz
17a0d13b0c Merge shyotl, setting include broken (disabled) 2010-11-09 15:14:34 +01:00