Diva Canto 3fa51f66ec Merge branch 'master' of ssh://opensimulator.org/var/git/opensim ... Conflicts: OpenSim/Framework/Util.cs		2012-03-20 17:19:14 -07:00
..
storage	…
CenomeCache.ini.example	…
FlotsamCache.ini.example	…
Grid.ini	…
GridCommon.ini.example	…
GridHypergrid.ini	More on HG access control. This commit splits the UserManagementModule into the Basic one and the HG one, so that we can do everything that needs to be done for HG ACLs to work without interfering with the vanilla opensim. For the moment, it finds foreign users who have left a trace in the region, e.g. an object. This makes it possible to ban/IM/etc these users using the regular avatar picker. TODO: contact the UAS directly given a name of the form First.Last @foo.com.	2012-03-17 15:36:20 -07:00
HyperSimianGrid.ini	…
SimianGrid.ini	…
Standalone.ini	…
StandaloneCommon.ini.example	Fix configuration problems where XAssetDatabasePlugin was picked up accidentally.	2012-03-19 00:18:04 +00:00
StandaloneHypergrid.ini	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