Commit Graph

59 Commits

Author SHA1 Message Date
Siana Gearz
41a305f52b OK seriously, how dumb can i be? 2011-10-13 18:55:16 +02:00
Siana Gearz
6590172641 Merge branch 'future' of https://github.com/Shyotl/SingularityViewer into future 2011-10-04 16:26:11 +02:00
Shyotl
30a95e7f45 Some cleanup. Using gAgentAvatarp in many places. Incl other misc small changes. 2011-10-03 22:45:13 -05:00
Shyotl
84a301c81a new throws an exception... checking if the return value is not null without either try/catching or using std::nothrow... would accomplish nothing. 2011-10-03 22:42:56 -05:00
Siana Gearz
9ac2c07f52 Merge https://github.com/PlayerDagostino/SingularityViewer into future
Conflicts:
	indra/llplugin/llplugininstance.cpp
	indra/llwindow/llwindowsdl.cpp
	indra/llwindow/llwindowsdl.h
	indra/newview/llpreviewnotecard.cpp
	indra/newview/llviewerwindow.h
2011-10-03 16:10:35 +02:00
Shyotl
244e30297f AIAPRPool, AIAPRRootPool, AIVolatileAPRPool, AIThreadLocalData etc, were rebranded by LL. Merging change to clean up diffs. 2011-09-20 22:08:48 -05:00
Shyotl
d917bf6b06 LLAPRFile cleaned up 2011-09-20 21:39:27 -05:00
Aleric Inglewood
3bde58d970 Wrap sGlobalRawMemory in AIThreadSafe.
This is accessed by different threads.
Other globals like it might also be
accessed by different threads, this has
to be investigated.
2011-08-18 19:32:45 +02:00
Player Dagostino
4d2447d764 Enable the DSO workaround on linux only AND in standalone. 2011-08-11 02:12:28 +02:00
Player Dagostino
a45de10024 Fix a problem not letting plugins work when the client is built on RedHat and derived systems (Fedora is affected too). Completely avoid apr_dso_load() on Linux (they modified it to open libraries with RTLD_NOW | RTLD_GLOBAL | RTLD_DEEPBIND). Get a standard DSO handle with RTLD_NOW | RTLD_GLOBAL flags instead, and convert it to a valid APR one by using apr_os_handle_put(). 2011-08-02 20:15:58 +02:00
Shyotl
ce064f5af2 Some safe merging with v2. 2011-07-14 01:35:15 -05:00
Siana Gearz
b73a9b9a34 Compensate for possible low LOD bit allocation shifts 2011-06-17 16:04:11 +02:00
Aleric Inglewood
474acdbff9 Add support for libcwd.
This patch has no influence if you don't have libcwd installed.
Note that libcwd (http://libcwd.sourceforge.net/) is only
available for linux.

A default compile of libcwd does memory allocation tracking,
which is too slow for everyday usage of the viewer (usable,
but notably slower) and we don't need that. Configure your
libcwd as follows:

./configure --prefix=/sl/usr --disable-alloc --enable-optimize

Or whatever prefix you prefer (add --enable-maintainer-mode
if you're compiling it from the SVN repository), add
--disable-nonthreading to compile twice as fast.

If you have it installed you can activate it's use by setting a
few environment variables:

CXXFLAGS="$(pkg-config --cflags libcwd_r)"
LDFLAGS="$(pkg-config --libs libcwd_r) -lpthread"

and then reconfiguring the viewer.

The -lpthread is needed when using ld.gold, however, if you
leave it out you might get an LDFLAGS that ends on trailing
whitespaces, which doesn't work for some reason.

Also, if you installed it in a non-standard place (/sl/usr
above) then you need this to run the viewer (and tests):

export LD_LIBRARY_PATH="/sl/usr/lib"
2011-05-08 17:08:48 +02:00
Aleric Inglewood
0fa396938b Merge branch 'master' of https://github.com/siana/SingularityViewer 2011-05-05 15:54:21 +02:00
Siana Gearz
eedc1f79ec Resolve stray VC8 CRT dependency by updating libs 2011-05-05 03:20:54 +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
Siana Gearz
90c22d8edf J2C stream length estimation back to old 2011-05-03 23:53:18 +02:00
Shyotl
4d4c49cd24 Merge branch 'master' into V2TextureSystem
Conflicts:
	indra/newview/llviewerimage.cpp
	indra/newview/pipeline.h
2011-04-12 22:29:49 -05:00
Shyotl
3a3805fd18 Texture console now shows number of 'cached' raw images.
png loading now immediately dumps allocated data on failure
2011-04-07 03:16:11 -05:00
Siana Gearz
ad4d974812 Stop j2c decode throbbing 2011-04-06 04:25:05 +02:00
Siana Gearz
4b4096857f Merge commit 'a028c4edba8a5ddb340afc8eebb56b06b363bab1' 2011-04-01 05:13:12 +02:00
Shyotl
acf31bb885 U32 LLImageJ2C::mAreaUsedForDataSizeCalcs now initialized to 0 2011-03-27 19:00:36 -05:00
Shyotl
74659e6121 LLImage update. Nothing big. Allocation checks and utility functions. 2011-03-27 18:59:41 -05:00
Siana Gearz
18b10638be Stupid headers -.- workaround 2011-03-26 04:02:51 +01:00
siana
baac16b5d2 OpenJPEG experiment, PCH circumcision 2011-03-20 04:44:58 +01:00
Siana Gearz
ee60606a04 Don't use C allocation in LLImage
because LLTextureCache/LLTextureFetch feed it new[]ed data!
2011-03-15 23:26:24 +01: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
Shyotl
a207a71066 V2 llimage merge 2011-02-22 18:21:02 -06:00
Siana Gearz
da61fc8195 Transparent PNG fix, by Thickbrick 2011-02-16 20:24:03 +01:00
Siana Gearz
bf0408ccd9 Partial revert "Crashfix texture viewer, update"
This reverts commit 85e26c05d1.
2011-01-13 04:52:14 +01:00
Siana Gearz
d68736da39 Put in some changes along sg1.4 dev history. 2010-11-21 15:57:44 +01:00
Siana Gearz
85e26c05d1 Crashfix texture viewer, update 2010-11-19 01:53:15 +01:00
Siana Gearz
3d60deaf31 Worked through rejects from sg1.5 merge. Went in smoothly O.o 2010-10-18 13:45:04 +02:00
unknown
3e8a7172db -Sanity checks from snowglobe. ...
-Null terminated a string buffer.
-Mutex locks are expensive.
-Realloc is my friend.
-But leaks are not.
-Nor are unused variables.
-And buffer overruns should get lost.
-bindManual shouldnt return failure if texture's already bound.
-Pulled windlight and classic clouds apart into unique rendertypes.
-'Client or Account' savedsettings stuff is now moar bettar. (and efficient)
-Replaced LLSavedSettingsGlue with something that supports gSavedSettings, gSavedPerAccountSettings, and gCOASavedSettings

-Added 'Enable Classic Clouds' checkbox to ascet performance settings panel
-New cards added to gpu table.
-General cleaning...
-How2spell 'dimensions'?
2010-10-01 00:35:39 -05:00
Beeks
2faa13a37b Collection of minor edits from Imprudence to fix bugs, etcetera. Also updated the version.
Also made the version almost entirely hard-coded to remove any remnants of Inertia's spoofer.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-21 14:49:46 -04:00
CharleyLevenque
cc1416f8fb Disabling KDU 2010-09-18 07:11:36 -04:00
Beeks
59d7c33954 Collection of theoretical improvements for ATI cards, as well as a couple memory leaks. Thanks to Shyotl for bringing them up and offering solutions.
Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-16 16:00:47 -04:00
CharleyLevenque
9d1073ac40 Changes to assist in building on Linux, more attempts at stopping OpenJPEG(?) related crashes, disabled being logged out for going AFK by default. 2010-08-28 02:22:41 -04:00
CharleyLevenque
8c23e3bdea More crash fixes. Fuck you OpenJPEG. Fuck you where it hurts. 2010-08-26 22:34:10 -04:00
Beeks
5ce4286fd7 f 2010-08-22 15:14:30 -04:00
phr0z3nt04st
7dc8d8a344 Windows compile fixed and ao fixed I think... 2010-08-10 01:10:03 -05:00
Hazim Gazov
d08468d005 add missing header file for last commit 2010-08-07 23:33:33 +00:00
Hazim Gazov
631d0ca9d2 add completed support for new aes encrypted image comments 2010-08-07 23:33:09 +00:00
Hazim Gazov
9ca534338c it's only 8 blocks, and put in some debug code 2010-08-03 01:26:41 +00:00
Hazim Gazov
a92fa7ded8 Revert "modified aes stuffs"
This reverts commit 6351f0fee7.
2010-08-01 09:45:48 +00:00
Hazim Gazov
6351f0fee7 modified aes stuffs 2010-08-01 07:05:59 +00:00
Hazim Gazov
2067c1b81b aes stuffs 2010-08-01 07:03:17 +00:00
Hazim Gazov
eaa739af0f Revert "aes comment decryption stuffs"
This reverts commit d2e31a87f4.
2010-08-01 07:02:43 +00:00
Hazim Gazov
d2e31a87f4 aes comment decryption stuffs 2010-08-01 07:01:24 +00:00
Hazim Gazov
62c1bd007f Revert "some stuff"
This reverts commit 5d993e35c4.
2010-08-01 04:54:14 +00:00