UbitUmarov 2f1eab2792 remove bad merge from master

2015-09-16 16:34:16 +01:00

..

Attachments

Merge of ubitworkvarnew with opensim/master as of 20150905.

2015-09-08 04:54:16 -07:00

AvatarFactory

seems to compile ( tests comented out)

2015-09-02 19:54:53 +01:00

BakedTextures

Merge of ubitworkvarnew with opensim/master as of 20150905.

2015-09-08 04:54:16 -07:00

Chat

seems to compile ( tests comented out)

2015-09-02 19:54:53 +01:00

Combat

seems to compile ( tests comented out)

2015-09-02 19:54:53 +01:00

Commands

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

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

Dialog

bad merge?

2015-09-01 14:54:35 +01:00

Friends

Deleted OpenSim.Framework.Communications. Moved its two remaining files to OpenSim.Framework.

2015-09-04 14:39:23 -07: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 of ubitworkvarnew with opensim/master as of 20150905.

2015-09-08 04:54:16 -07:00

Inventory

remove bad merge from master

2015-09-16 16:34:16 +01:00

Lure

bad merge?

2015-09-01 14:54:35 +01:00

Profile

Ensure selected module is the only active one

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

UserProfiles

seems to compile ( tests comented out)

2015-09-02 19:54:53 +01:00