Commit Graph

1103 Commits

Author SHA1 Message Date
Siana Gearz
8227efcaf1 Make our build and packaging shine again 2011-05-09 13:35:51 +02:00
Siana Gearz
2ca4d1bf64 Merge branch 'AlericMaster' of git://github.com/Shyotl/SingularityViewer 2011-05-09 00:49:21 +02:00
Siana Gearz
e371c2e93d Repo cleanup. Sheesh, who packaged pics with a lib? 2011-05-09 00:40:38 +02:00
Siana Gearz
8d2b56b1eb Fixed prebuilt fetching, Snowglobe style 2011-05-08 23:25:21 +02:00
Shyotl
2529644e90 Should now compile on VC100 again. 2011-05-08 16:25:03 -05:00
Shyotl
1a099167ae Fixing Win compile. (Partial) 2011-05-08 20:34:32 +02:00
Shyotl
0638fafe66 Fixing Win compile. (Partial) 2011-05-08 12:46:42 -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
Siana Gearz
7e75a897ca Release 1.5.7 2011-05-08 16:46:12 +02:00
Siana Gearz
de1a86004d This should fix media 2011-05-08 16:15:20 +02:00
Siana Gearz
205a11d44b Merge git://github.com/Shyotl/SingularityViewer 2011-05-08 14:46:28 +02:00
Shyotl
faf86fdf24 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into AlericMaster 2011-05-07 23:48:28 -05:00
Shyotl
c5917d79c7 Resetting media texture reference timer on update call to prevent purging from texture list while still in use. Keeping nullcheck just to be safe. (Broken video is preferable to a crash) 2011-05-07 21:49:48 -05:00
Siana Gearz
63b0bf0f30 New tcmalloc, just in case old one has VC10 bugs 2011-05-08 00:51:53 +02:00
Siana Gearz
82478d4ef2 Apparently some of those is needed on Windows, and it was shoddy 2011-05-08 00:51:00 +02:00
Shyotl
2a9e7ec5f7 Merge branch 'master' of git://github.com/siana/SingularityViewer.git 2011-05-07 17:24:36 -05:00
Shyotl
7e16e0624a Scare everyone with a big-arsed warning. Horray! 2011-05-07 01:41:28 -05:00
Siana Gearz
e3f9b4dbbe Help me keep track of VBOs 2011-05-07 05:47:13 +02:00
Siana Gearz
0903241b8f Merge git://github.com/Shyotl/SingularityViewer 2011-05-06 13:50:20 +02:00
Shyotl
779fe9cfaa General cleanup. Potential line-width inconsistency tweak. Wearable creation cleanup. 2011-05-06 00:20:41 -05:00
Siana Gearz
f052915f54 Fix name in grant/ungrant edit right. Issue 33 2011-05-06 04:34:32 +02: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
Siana Gearz
e6db03054b Merge git://github.com/Shyotl/SingularityViewer 2011-05-05 03:28:55 +02:00
Siana Gearz
eedc1f79ec Resolve stray VC8 CRT dependency by updating libs 2011-05-05 03:20:54 +02:00
Shyotl
5b36f29b76 LLViewerObject::setPosition already calls updateDrawable. Removing extra updateDrawablecalls.
Referring to cam axis byref.
2011-05-04 19:56:55 -05:00
Shyotl
96f400eb4c LLViewerObjectList::mDeadObjects has no reason to be a std::map any longer. Converted to std::set as per v2. 2011-05-04 19:55:17 -05:00
Aleric Inglewood
86a19e8e91 IMP-701: An API to wrap objects for thread-safe access.
See http://redmine.imprudenceviewer.org/issues/701
2011-05-05 02:54:38 +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
5b08560047 Update of doc/contributions.txt with patches from snowstorm already in Singularity. 2011-05-04 22:23:49 +02:00
Siana Gearz
4666e29fb7 install Hunspell dictionaries 2011-05-04 21:10:59 +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
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
8983f4a186 Don't crash there. 2011-05-04 14:46:23 +02:00
Shyotl
03c98452be Merge branch 'master' of git://github.com/siana/SingularityViewer.git 2011-05-03 18:25:31 -05:00
Shyotl
e50aa5ab88 Disabled general spam blocking until exception is added for delayed instant messages. 2011-05-03 18:24:42 -05:00
Siana Gearz
d611f6b741 Adding hunspell dll/so/dylib 2011-05-04 00:07:32 +02:00
Siana Gearz
44cf222104 Now can offer teleport to anyone 2011-05-04 00:03:55 +02:00
Siana Gearz
90c22d8edf J2C stream length estimation back to old 2011-05-03 23:53:18 +02:00
Siana Gearz
7d417faaf4 Merge git://github.com/Shyotl/SingularityViewer 2011-05-03 19:34:16 +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
Shyotl
9ea3032fee Reverted some preloaded textures to pre-v2 filenames so they are actually found. 2011-05-02 23:15:48 -05:00
Shyotl
3dff32d2ab Now that depth blitting appears to work, moving hovertext and such to ui render. Also, added depth-culling in a few more spots to hopefully lessen frag shader usage in deferred. 2011-05-02 17:05:06 -05:00
Shyotl
65c2a46121 Workaround for depth+stencil blitting on AMD(Ati) hardware, plus alteration to blitting to framebuffer when using MSAA. 2011-05-02 17:02:44 -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
Aleric Inglewood
c0c786b39f Make loading prebuilts work.
Copied indra/cmake/Prebuilt.cmake from imprudence,
which fixed this issue.
2011-05-02 20:50:26 +02:00
Aleric Inglewood
1ced64e0b4 Add LLWeb::curlEscape
Since curl 7.21.2 - (October 13 2010), curl_escape (a deprecated
function that will be removed in the future) changed it's behavior
and no longer escapes the characters '-', '.', '_' and '~'.

The only reasonable solution for us is to stop using it and
use our own version that mimics the old behavior. The only
other alternative would be to rename every .xml file with
escaped characters in their name upon installation, depending
on the behavior of the installed libcurl (on standalone anyway).
However, if you add to that in the future curl_escape has to
be replaced with curl_easy_escape, which is far from easy to
call as it requires a CURL to be passed for which LL invented
a wrapper in libllmessage, but did hide that (Curl::Easy is
only defined in a .cpp file), then we're better of just using
our own function, which I named LLWeb::curlEscape.
2011-05-02 20:15:50 +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
Aleric Inglewood
1b4ae2e3b5 Removed generated file mime_types.xml, and fixed indentation in the source files.
indra/newview/skins/default/xui/en-us/mime_types.xml should be generated
from mime_types_linux.xml, mime_types_mac.xml or mime_types_windows.xml
by copying it when packaging. Hence, it should never be used.

Note, this is an exact sync with imprudence.
2011-05-02 15:26:49 +02:00