Commit Graph

47 Commits

Author SHA1 Message Date
Aleric Inglewood
41f13dbf46 Merge branch 'master' of https://github.com/siana/SingularityViewer
Added missing header to indra/newview/ascentkeyword.cpp now that
llviewerpluginmanager.h has a couple of header dependencies less.

Resolved Conflicts:
	indra/llcommon/CMakeLists.txt

Proximity: addition of two independent things. Just included both.
2011-05-14 01:06:19 +02:00
narv
981e4f39b2 Revert to build llcommon on Darwin 2011-05-12 07:41:49 -07: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
Siana Gearz
8227efcaf1 Make our build and packaging shine again 2011-05-09 13:35:51 +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
Aleric Inglewood
e89d6d9d66 Split plugin classes and derive AIFilePicker from BasicPluginBase (part 1).
This commit contains all changes, except those in indra/media_plugins
(which was renamed to indra/plugins) and indra/llplugin.

However, it does contain the (new) file
indra/plugins/filepicker/basic_plugin_filepicker.cpp
2011-05-08 17:10:38 +02:00
Aleric Inglewood
111c671a21 Also strip libraries on x86_64, which uses lib32 and lib64 directory names 2011-05-08 17:08:47 +02:00
Aleric Inglewood
0fa396938b Merge branch 'master' of https://github.com/siana/SingularityViewer 2011-05-05 15:54:21 +02:00
Siana Gearz
4666e29fb7 install Hunspell dictionaries 2011-05-04 21:10:59 +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
Siana Gearz
d611f6b741 Adding hunspell dll/so/dylib 2011-05-04 00:07:32 +02:00
Aleric Inglewood
094587aefd Make viewer compile on standalone linux x86_64
This involves making libllcommon shared, a change
that was not finished for windows/Mac.
More changes are needed to indra/newview/viewer_manifest.py
for those two operating systems, as well as to
indra/copy_win_scripts.

I did not test this on linux 32bit, nor non-standalone
on that OS, either.

I did not check voice (which will very likely not work
anyway on 64bit). And currently the webkit plugin doesn't
work for me, but I'll fix that in a different commit.
2011-05-02 19:40:33 +02:00
tmac@latestevidence.com
af203533b3 Spell check added 2011-04-23 18:08:59 -04:00
Siana Gearz
fcc98ffe46 Singularity 1.5.6 release 2011-04-08 23:52:52 +02:00
siana
611b8f48d6 VC10 fixes 2011-03-21 03:13:49 +01:00
siana
e70a91311f don't botch Python syntax so badly 2011-03-19 14:17:37 +01:00
siana
472dade93a More build/package fixes 2011-03-19 00:14:20 +01:00
siana
146cb0ef97 Merge git://github.com/narv/SingularityViewer 2011-02-21 16:06:01 +01:00
siana
31b3c8e755 Singularity 1.5.4(2) fixes 2011-02-21 15:15:55 +01:00
narv
a5f7c3f7cd er, copy of skins in darwin manifest not needed 2011-02-20 23:33:43 -07:00
narv
b48a16ee82 copy over current supported skins on Darwin 2011-02-20 14:49:24 -07:00
siana
4069151bc2 llqtwebkit 1.6, static apr on windows 2011-02-20 04:11:05 +01:00
Siana Gearz
144f8d720a Splash page in Grid Manager 2011-02-06 02:48:14 +01:00
narv
7da2821fc0 Updated for Darwin 2011-02-02 16:12:37 -07:00
Siana Gearz
67f2145407 More mac remote fudging 2011-01-25 16:15:25 +01:00
Siana Gearz
708d208654 Goodbye updater 2011-01-25 05:50:49 +01:00
Siana Gearz
77fc0e82c8 Linux version 2011-01-04 02:00:25 +01:00
siana
774e20a764 1.5.2 release, assorted fixes 2011-01-02 17:23:37 +01:00
Siana Gearz
037593aa99 Google tcmalloc 2011-01-01 02:56:41 +01:00
siana
bc0e5d29a5 Another webkit fix, icons 2010-12-25 20:40:09 +01:00
Siana Gearz
9581509948 Icon branding 2010-12-25 05:03:04 +01:00
siana
9417eadb4c Installer fix 2010-12-23 04:25:30 +01:00
siana
aff58d0ab9 Unbroke Windows build (vc9 compat only) 2010-12-19 03:35:24 +01:00
Siana Gearz
f2d43d5239 Settings, UI fix 2010-11-15 11:46:00 +01:00
Siana Gearz
e6806f3b16 Branding pt2 2010-11-15 10:45:16 +01:00
Siana Gearz
6a7c9250fd Branding pt1 2010-11-14 17:28:44 +01:00
Siana Gearz
9cb3da23ea Skin packaging fix 2010-11-05 16:30:48 +01: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
November
94d21fb256 Reverting a retarded edit while half-awake. 2010-09-27 00:22:33 -07:00
November
c166704c81 Forgot a single file. Affects Mac only. 2010-09-27 00:19:16 -07:00
CharleyLevenque
b3e955cc28 Package builder fixes, show friends with custom tag/color. 2010-09-03 02:46:20 -04:00
CharleyLevenque
ae4dcc283c Whole bunch of crash fixes and compiler junk. 2010-08-29 00:40:22 -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
Hazim Gazov
615202da70 added code to disable llwind 2010-04-17 19:14:57 -03:00
Hazim Gazov
22b9bd1c2e Revert "Added option to disable LLWind"
This reverts commit 0677acc8e3.
2010-04-17 00:18:34 -03:00
Hazim Gazov
0677acc8e3 Added option to disable LLWind 2010-04-17 00:16:35 -03:00
Hazim Gazov
7a86d01598 Imported existing code 2010-04-02 02:48:44 -03:00