Melanie 45e333652c Merge branch 'master' into careminster ...

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

2013-06-07 23:09:53 +01:00

..

Attachments

Merge branch 'master' into careminster

2013-05-11 02:35:26 +01:00

AvatarFactory

Protect one more update of the baked texture hashes.

2013-05-24 13:25:25 -07:00

Chat

Following on from 476a7d3e (which wasn't enough), make chat across regions on different simulators work.

2013-03-22 01:43:18 +00:00

Combat

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

2012-11-12 18:08:02 -08: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

In LocalFriendshipTerminated, send the original client's agentId to the friend being removed instead of the friend's own id.

2013-06-07 18:43:00 +01: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 'avination-current' into careminster

2013-06-06 03:20:15 +01:00

InstantMessage

Merge branch 'master' into careminster

2012-12-07 03:49:04 +00:00

Inventory

Merge branch 'master' into careminster

2013-04-30 23:45:38 +01:00

Lure

Merge branch 'master' into careminster

2013-03-28 02:29:07 +00:00

Profile

Adding back the BasicProfileModule

2013-05-31 21:19:15 -04:00

UserProfiles

Prevent processing for Npc

2013-06-05 18:42:15 -04:00