Melanie Thielker 159fcbf150 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster ...

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

2014-06-21 00:39:55 +02:00

..

Attachments

Merge branch 'master' into careminster

2013-11-23 19:13:22 +00:00

AvatarFactory

Committing the Avination Scene Presence and related texture code

2013-12-11 01:39:56 +00:00

Chat

Merge branch 'master' into careminster

2013-10-06 18:32:20 +01:00

Combat

* Fix a null ref that causes a stack unwind when crossing borders. Less stack unwinding.. the faster it goes.

2013-08-24 05:55:53 -05:00

Commands

Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.

2012-07-25 23:11:50 +01:00

Dialog

Merge branch 'master' into careminster

2012-11-13 02:10:09 +00:00

Friends

* Refactor

2013-10-07 23:19:50 -05:00

Gestures

Cleanup on region modules: gave short node id's to all of them.

2012-11-12 18:08:02 -08:00

Gods

Merge branch 'master' into careminster

2013-10-04 20:03:12 +01:00

InstantMessage

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

2014-06-21 00:39:55 +02:00

Inventory

Merge branch 'master' into careminster

2014-01-28 21:02:20 +00:00

Lure

Merge branch 'master' into careminster

2013-10-04 20:03:12 +01:00

Profile

Ensure selected module is the only active one

2013-06-07 20:09:10 -04:00

UserProfiles

Intermediate commit. Sill errors.

2014-01-05 20:12:32 +00:00