Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
1,102 Commits 20 Branches 51 Tags
2ca4d1bf645da8cd11c5ecc2130483ded79439a9
Commit Graph

75 Commits

Author SHA1 Message Date
Siana Gearz
2ca4d1bf64 Merge branch 'AlericMaster' of git://github.com/Shyotl/SingularityViewer 2011-05-09 00:49: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
Shyotl
faf86fdf24 Merge branch 'master' of https://github.com/AlericInglewood/SingularityViewer.git into AlericMaster 2011-05-07 23:48: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
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
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
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
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
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
26c40255aa Remove CR from configuration, source and xml files. 2011-05-01 22:16:05 +02:00
Shyotl
332cfdb532 Updated llinventory to something closer to V2's implementation. Mostly just restructuring. 
Most the changes are due to InventoryObjectList* changing to LLInventoryObject::object_list_t*, LLInventoryItem::II_FLAGS* changing to LLInventoryItemFlags::II_FLAGS* and also const'ing.
Certain perms for certain asset types(callcard&landmarks) have been laxed, as per LL's V2.
LLInventoryType now does lookups mostly though new lldictionary class.
LLLandmark using boost for callbacks, instead of custom class structure.
 2011-04-28 01:43:44 -05:00
Siana Gearz
ab8656d5d8 Version 1.5.6(1) 2011-04-09 22:57:39 +02:00
Siana Gearz
fcc98ffe46 Singularity 1.5.6 release 2011-04-08 23:52:52 +02:00
Shyotl
de109f9f97 LLSD update. LLSD::insert no longer returns self. Use LLSD::with if return value is required. 2011-03-27 19:06:15 -05:00
Shyotl
dc62c29af0 Extended win OS detection to include vista and win7 2011-03-27 18:56:30 -05:00
Shyotl
18af6baedd Cleaned up a few minor things 2011-03-27 18:50:04 -05:00
Shyotl
387e8ed756 JointMesh face update optimization 2011-03-15 05:13:06 -05:00
Shyotl
1c33889762 Merge branch 'master' into V2Renderer 2011-03-15 03:15:56 -05:00
Shyotl
0eab7bd2a5 Merge branch 'master' of git://github.com/siana/SingularityViewer.git 2011-03-15 02:36:25 -05:00
Shyotl
62d7f3d59f Misc llcommon tidbits from v2. 2011-03-15 02:33:55 -05:00
Shyotl
e29d969631 Misc llcommon tidbits from v2. 2011-03-15 02:28:22 -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
dcb2e43329 Release 1.5.5 2011-03-05 16:04:52 +01:00
Siana Gearz
58a0e3feee upgrade to BlurryGreyTextures V8 2011-03-03 03:32:01 +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
Siana Gearz
56f4fb3d55 GCCified that 2011-02-26 22:08:31 +01: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
58edba5129 V2 llrender merge, sans freetype and LLTexture 2011-02-24 18:08:17 -06:00
Shyotl
723fa64f6f V2 llmath merge part 2 2011-02-23 01:40:47 -06:00
Shyotl
b31db27545 V2 llcommon merge 2011-02-22 18:24:17 -06:00
siana
31b3c8e755 Singularity 1.5.4(2) fixes 2011-02-21 15:15:55 +01:00
siana
89a8b3cfa0 1.5.4 Release 2011-02-20 05:16:22 +01:00
siana
4069151bc2 llqtwebkit 1.6, static apr on windows 2011-02-20 04:11:05 +01:00
narv
2f1c78337b Remove install of llcommon as a dylib 2011-02-02 15:20:39 -07:00
siana
7781e2c094 1.5.3 release 2011-01-14 03:29:40 +01:00
Siana Gearz
e89db0b4b1 HTTP links in group notices and extended group limit ready. 2011-01-04 14:48:23 +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
5fd5049e9b Henri's HTTP pipeline, with SG twist 2010-12-30 21:17:51 +01:00
siana
784ef47048 Tag, settings 2010-12-26 01:53:36 +01:00
Siana Gearz
9983d0b803 Display Name work 2010-12-13 00:31:01 +01:00
Siana Gearz
d023dd1869 Windows DLLs are such zombies! 2010-11-27 01:09:47 +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
e6806f3b16 Branding pt2 2010-11-15 10:45:16 +01:00