Commit Graph

61 Commits

Author SHA1 Message Date
Shyotl
3fbfeb2de5 llmessage v2 merge. 2011-07-15 02:04:57 -05:00
Shyotl
7e0ee6bb71 Shiny new name cache. 2011-07-15 00:21:38 -05:00
Shyotl
4f8f24921f Aleric is right. This makes no sense. Don't bring this from v2, cuz it's wrong. 2011-07-12 15:35:35 -05:00
Shyotl
cae99f6cc8 Datapacker potentially leaking buffers? 2011-07-12 03:38:23 -05:00
Shyotl
bbc6f9d4c3 Preventing nullptr crash due to LLURLRequest::process_impl being called before initilization on rare occasion. 2011-06-13 20:14:59 -05:00
Shyotl
c029f00e12 CURL easy handles are now cached for reacquisition. Should lessen hitching by about half on systems exhibiting such. 2011-05-20 19:03:43 -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
Shyotl
62e3aa10c1 Reasonably safe changes.
Using accessor for vertexbuffer in LLFace
Extra occlusion query lookup in llgl (unused)
Const changes.
2011-05-18 14:35:27 -05: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
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
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
Shyotl
c2f0aa53af PumpIO fasttimer now child of Pump fasttimer (instead of being blindly added to Pump). Aids debugging pumpIO hitching. 2011-05-03 01:15:17 -05: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
Shyotl
0cbb9a7078 Iterator fix in llavatarnamecache.cpp from v2. 2011-05-01 17:24:37 -05:00
Aleric Inglewood
26c40255aa Remove CR from configuration, source and xml files. 2011-05-01 22:16:05 +02:00
Shyotl
722a1dda04 Minor iterator loop change. http://hg.secondlife.com/viewer-development/changeset/89a345e2d1cf
Also a little v2 cleanup snuck in.
2011-04-28 01:20:42 -05:00
Siana Gearz
82667f5618 Merge git://github.com/Shyotl/SingularityViewer 2011-03-25 03:41:11 +01:00
Siana Gearz
179f4ddabb The Octopus Feature
___
                     .-'   `'.
                    /         \
                    |         ;
                    |         |           ___.--,
           _.._     |0) ~ (0) |    _.---'`__.-( (_.
    __.--'`_.. '.__.\    '--. \_.-' ,.--'`     `""`
   ( ,.--'`   ',__ /./;   ;, '.__.'`    __
   _`) )  .---.__.' / |   |\   \__..--""  """--.,_
  `---' .'.''-._.-'`_./  /\ '.  \ _.-~~~````~~~-._`-.__.'
        | |  .' _.-' |  |  \  \  '.               `~---`
         \ \/ .'     \  \   '. '-._)
          \/ /        \  \    `=.__`~-.
     jgs  / /\         `) )    / / `"".`\
    , _.-'.'\ \        / /    ( (     / /
     `--~`   ) )    .-'.'      '.'.  | (
            (/`    ( (`          ) )  '-;
             `      '-;         (-'
2011-03-24 23:54:23 +01:00
Shyotl
23e1521a6b Some assertions, just in case. 2011-03-24 05:00:46 -05:00
Shyotl
f9937d7f8a V2 llmessage merge, incl. llcommon requisites.
Excluded llareslistener, as that appears to only be present for unit-testing
Excluded new SSL methods because, well, they don't work right reliably in v2 for me
2011-02-25 19:30:59 -06:00
Shyotl
723fa64f6f V2 llmath merge part 2 2011-02-23 01:40:47 -06:00
Siana Gearz
384ed0b3f8 Merge branch 'master' of https://github.com/Shyotl/SingularityViewer 2011-02-13 22:01:18 +01:00
Siana Gearz
72c4c52372 Assorted fixes 2011-02-12 23:33:11 +01:00
Shyotl
a44d633bc8 Enabled post-processing features. Todo: Fix bloom
Fixed avatar shadows on AMD (and any other sane GLSL compiler)
Fixed windows compile:
 -curl version was updated after running develop.py. Not sure if applicable to linux/darwin
 -new llqtwebkit version on windows, since the old url is now invalid.
2011-02-09 19:21:31 -06:00
siana
d65a5ffeb7 Assorted DN and RLVa fixes from Phoenix 2011-01-02 02:05:32 +01:00
Siana Gearz
9983d0b803 Display Name work 2010-12-13 00:31:01 +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
d68736da39 Put in some changes along sg1.4 dev history. 2010-11-21 15:57:44 +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
2df81c3580 Build fixes 2010-10-18 20:43:10 +02:00
Siana Gearz
5a67fcd623 Revert "THE BIGGIE."
This reverts commit ec55705bdd.

Conflicts:

	indra/newview/ascentprefsvan.cpp
	indra/newview/llinventorybridge.cpp
	indra/newview/skins/default/xui/en-us/panel_preferences_ascent_vanity.xml
2010-10-18 18:27:09 +02:00
Siana Gearz
3d60deaf31 Worked through rejects from sg1.5 merge. Went in smoothly O.o 2010-10-18 13:45:04 +02:00
Siana Gearz
babc0dc420 Snowgobe 1.4.2 to 1.5.0 patch part 1 (no rejects) 2010-10-18 10:25:32 +02:00
unknown
227a72c421 VC2010 cmake alterations. Lib stuff not included. 2010-10-05 01:34:35 -05:00
unknown
b2bd45eed8 -Screwed around with SSE2.
-Added ReleaseSSE2 as a build target.
-LL_VECTORIZE is silly and breaks things...
-Small little tweaks.

I have not tested if the cmake alterations work under linux and darwin. Hollar if broken.
2010-10-02 02:13:17 -05:00
Beeks
ec55705bdd THE BIGGIE.
Holy hell, this was an interesting one to implement. I wish I understood it better. Unfortunately I think this marks the end of trying to re-implement the Local Inventory for Temp and Local textures. It's just not feasible now that the entire inventory system has been whipped into a code shitstorm.

Signed-off-by: Beeks <HgDelirium@gmail.com>
2010-09-22 06:48:48 -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
Beeks
5ce4286fd7 f 2010-08-22 15:14:30 -04:00
phr0z3nt04st
82aef8fa4c Massive commit, beefed up the audio crash prevention, made a blacklist for assets, added sound explorer, fixed import, added item button to vfs explorer.
JELLY ROLL
2010-07-08 00:20:37 -05:00
phr0z3nt04st
c6a4f2570f Shift Right click now works on profile pictures, fixed minor message system bug where packets going in would be considered spoofed packets 2010-07-06 12:24:00 -05:00
phr0z3nt04st
4a88db9c5a Added darwin silliness to net canary 2010-06-23 18:14:11 -05:00
phr0z3nt04st
b799b9b25a Fixed a windows compile error 2010-06-22 17:14:45 -05:00
phr0z3nt04st
b13bbd7b40 Added ip spoofing protectection. 2010-06-22 15:31:11 -05:00
Hazim Gazov
8c30333d98 fix method declaration in llmessage test 2010-06-16 22:57:14 -03:00
phr0z3nt04st
04bb5ca573 You can't convert NULL to a int... 2010-06-13 19:21:05 -05:00
Hazim Gazov
c44805ae20 preliminary inbound message spoofing support completed 2010-06-13 09:36:32 +00:00
phr0z3nt04st
fd62612579 Made everything more memory efficient. 2010-06-09 17:52:03 -05:00
Hazim Gazov
2a6cba42a8 replacing crlf with lf 2010-06-08 22:40:45 -03:00
Hazim Gazov
7ad3be1baa convert crlf to lf 2010-06-08 22:39:17 -03:00