Melanie ee9210f656 Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs

2012-03-21 00:26:02 +00:00

..

GatekeeperService.cs

Fixes mantis #5923

2012-03-08 15:55:43 -08:00

HGAssetService.cs

HG: normalize all externalized user ULRs to be the Home URL, i.e. the location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.

2012-01-12 09:56:35 -08:00

HGFriendsService.cs

HG Friends: allow the establishment of HG friendships without requiring co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.

2012-03-20 17:14:19 -07:00

HGInstantMessageService.cs

minor: remove mono compiler warning

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

HGInventoryService.cs

HG Inventoty: Guard against items not found.

2012-01-26 17:00:58 -08:00

UserAccountCache.cs

Merge branch 'master' into careminster-presence-refactor

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

UserAgentService.cs

Merge branch 'master' into careminster

2012-03-21 00:26:02 +00:00