Jonathan Freedman e371d3208c Merge branch 'master' into mantis5110 ...

Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs

2010-10-30 14:10:13 -04:00

..

Agent

Move code that allows llGiveInvetory() to move item into appropriate system folder up from connectors into Scene.Inventory.cs

2010-09-04 01:36:26 +01:00

Asset

Add linden prim renderer and update libOMV

2010-10-04 00:10:08 +01:00

Avatar

Merge branch 'master' into mantis5110

2010-10-30 14:10:13 -04:00

Framework

Merge branch 'master' into mantis5110

2010-10-30 14:10:13 -04:00

Hypergrid

Revert "Updates all IRegionModules to the new style region modules."

2010-01-29 07:21:06 +00:00

InterGrid

Revert "Merge remote branch 'otakup0pe/mantis5110'"

2010-10-22 23:52:07 +01:00

LightShare

Make windlight set the default environment on start

2010-10-05 01:54:15 +01:00

Resources

Fix incorrect class name

2010-10-06 02:16:42 +01:00

Scripting

Change the way IRegionModule us referenced by IEmailModule to

2010-06-28 03:14:05 +01:00

ServiceConnectorsIn

Renamed the Helo server connector to a consistent name. Added this in connector to both Robust.HG.ini.example and HypergridServiceInConnectorModule.

2010-09-08 14:12:01 -07:00

ServiceConnectorsOut

Merge branch 'justincc-dev'

2010-10-29 23:15:35 +01:00

World

Merge branch 'master' into mantis5110

2010-10-29 23:59:16 -04:00