Melanie 5ab536a1e9 Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs

2011-12-05 17:10:51 +00:00

..

GatekeeperService.cs

HG: Renamed one method

2011-12-04 08:24:16 -08:00

HGAssetService.cs

Guard HGAssetService against uninitialized variables and null arguments.

2011-10-15 20:23:26 -07:00

HGInstantMessageService.cs

minor: remove mono compiler warning

2011-08-17 23:28:57 +01:00

HGInventoryService.cs

HG inventory transfers over the profile working.

2011-05-27 08:19:40 -07:00

UserAccountCache.cs

Merge branch 'master' into careminster-presence-refactor

2011-01-18 01:28:50 +00:00

UserAgentService.cs

Merge branch 'master' into bigmerge

2011-12-05 17:10:51 +00:00