Melanie 464fb2533f Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
	OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs

2012-04-20 16:48:43 +01:00

..

GatekeeperServiceConnector.cs

Merge branch 'master' into careminster

2012-04-20 16:48:43 +01:00

HeloServiceConnector.cs

minor: remove mono compiler warning

2012-01-07 00:32:32 +00:00

HGFriendsServiceConnector.cs

HG Friends: reroute the status notifications to the HGFriends service, so that they can scale better. They were previously being handled by the UAS; that is still there, but it's now obsolete and will be removed in a future release.

2012-03-21 10:35:06 -07:00

UserAgentServiceConnector.cs

Merge branch 'master' into careminster

2012-03-22 20:38:49 +00:00