Melanie 24a49011cb Merge branch 'master' into careminster

2012-02-21 22:54:00 +00:00

..

Agent

Merge branch 'master' into careminster

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

Asset

Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge

2011-10-25 03:18:29 +01:00

Avatar

Merge branch 'ubitwork'

2012-02-19 20:08:01 +01:00

Framework

Merge branch 'master' into careminster

2012-02-20 19:48:28 +00:00

Hypergrid

…

InterGrid

Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.

2011-10-25 20:24:21 +01:00

LightShare

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

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

Resources

…

Scripting

Merge branch 'master' into careminster

2012-01-14 06:09:19 +00:00

ServiceConnectorsIn

Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.

2011-10-25 20:24:21 +01:00

ServiceConnectorsOut

Merge branch 'master' into careminster

2012-02-19 14:57:51 +00:00

World

Merge branch 'master' into careminster

2012-02-21 22:54:00 +00:00