Melanie a5781ea9fc Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination ...

Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs

2012-12-17 01:59:50 +01:00

..

ApplicationPlugins

Merge branch 'master' into careminster

2012-11-17 02:03:24 +00:00

Capabilities

* Fix a null ref error in /..../OpenSim/Region/ClientStack/Linden/Caps/GetMeshModule.cs:339

2012-11-24 22:09:34 -05:00

ConsoleClient

A few more AssemblyInfos in a few more dlls.

2012-11-14 08:10:15 -08:00

Data

Check database for root prim IDs only to try and get a handle on prim loss

2012-12-09 23:25:07 +01:00

Framework

add a Check method to flotsamAssetCache, so to check if a asset is in

2012-12-13 02:55:36 +00:00

Region

Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination

2012-12-17 01:59:50 +01:00

Server

Merge branch 'master' into careminster

2012-11-22 13:37:27 +00:00

Services

add some default size setting and checks

2012-12-07 21:53:33 +00:00

Tests

Merge branch 'avination' into careminster

2012-11-20 01:21:15 +00:00

Tools

The last few AssemblyInfos. Finished!

2012-11-14 21:18:18 -08:00