Melanie 31736b1aac Merge branch 'master' into bigmerge ...

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

2011-11-17 19:04:27 +00:00

..

Attachments

Merge branch 'master' into bigmerge

2011-11-06 20:54:13 +00:00

AvatarFactory

Merge branch 'master' into bigmerge

2011-11-03 00:06:14 +00:00

Chat

Merge branch 'master' into bigmerge

2011-11-04 01:18:37 +00:00

Combat

Start using IPrimCounts populated by PrimCountModule instead of LandData counts populated by LandManagementModule.

2011-03-25 23:05:51 +00:00

Dialog

Merge branch 'master' into bigmerge

2011-11-04 01:18:37 +00:00

Friends

Merge branch 'master' into bigmerge

2011-11-17 19:04:27 +00:00

Gestures

Fix build break

2011-01-18 01:48:37 +00:00

Gods

Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to

2011-11-03 17:06:08 -07:00

Groups

Revert "Updates all IRegionModules to the new style region modules."

2010-01-29 07:21:06 +00:00

InstantMessage

Merge branch 'master' into bigmerge

2011-11-14 20:03:47 +00:00

Inventory

Merge branch 'master' into bigmerge

2011-10-27 18:14:38 +01:00

Lure

Merge commit '3ccb58c05c0a11fb4cff0f3adf90ca29d67b0c8b' into bigmerge

2011-10-11 22:43:27 +01:00

Profile

minor: remove mono compiler warnings

2011-07-16 02:56:54 +01:00