Melanie fd22159d0c Merge branch 'master' into bigmerge ...

Conflicts:
	OpenSim/Framework/Watchdog.cs

2011-10-26 01:27:24 +01:00

..

FriendsModule.cs

Merge branch 'master' into bigmerge

2011-10-26 01:27:24 +01:00

FriendsRequestHandler.cs

Allow cross-scope friendships to work, and also allow other cross scope name

2011-01-03 19:42:46 +00:00

HGFriendsModule.cs

A few more cleanups on the way to close http://opensimulator.org/mantis/view.php?id=5516 once and for all. Moral of the story: don't send AgentOnline/Offline to viewers with a zero-length array.

2011-06-11 17:48:19 -07:00