Melanie 3889e68c54 Merge branch 'master' into careminster-presence-refactor ...

Conflicts:
	OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
	OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
	OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs
	OpenSim/Services/GridService/HypergridLinker.cs

2011-02-07 22:08:53 +00:00

..

Interfaces

Revert "Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to another region.""

2010-12-03 18:32:03 +01:00

Shared

Merge branch 'master' into careminster-presence-refactor

2011-02-07 22:08:53 +00:00

XEngine

Preserve the script running flag when copying an object.

2011-01-08 16:44:28 +01:00