Melanie ed67b698d3 Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster ...

Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.Inventory.cs

2012-03-22 23:05:58 +00:00

..

Agent

Merge branch 'master' into careminster

2012-01-28 01:01:23 +00:00

Asset

Merge branch 'master' into careminster

2012-03-08 19:10:22 +00:00

Avatar

Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminster

2012-03-22 23:01:50 +00:00

Framework

Merge branch 'master' into careminster

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

Hypergrid

3rd way of reseting the HG Map. This time, don't use the grid service; instead keep track of which map blocks each client has seen in the region, and reset exactly those when the client closes.

2011-06-10 17:22:17 -07:00

InterGrid

Stop spurious scene loop startup timeout alarms for scenes with many prims.

2012-02-24 05:02:33 +00:00

LightShare

Introduce a LightShare kill packet ans send it when needed. Currently only

2011-12-28 09:24:02 +00:00

Resources

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

Scripting

Merge branch 'master' into careminster

2012-03-07 00:51:59 +00:00

ServiceConnectorsIn

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

ServiceConnectorsOut

Merge branch 'master' into careminster

2012-03-20 02:48:11 +00:00

World

Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster

2012-03-22 23:05:58 +00:00