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

..

Agent

Add a "useCached" parameter to GetUserAccount. Add a function to Scene to get the user flags. It has to be here due to access restrictions :/

2011-01-26 16:25:08 -08:00

Asset

Fix casts in llSetPayPrice

2010-12-15 08:15:12 +01:00

Avatar

Merge branch 'master' into careminster-presence-refactor

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

Framework

Merge branch 'master' into careminster-presence-refactor

2011-02-07 22:08:53 +00: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

When LightShare is enabled, the standard day cycle is bypassed and replaced by

2010-11-03 02:04:17 +00:00

Resources

Adding the prim count module skeleton

2011-01-28 23:44:17 +00:00

Scripting

Repair x-query-string

2011-02-03 17:25:55 -08:00

ServiceConnectorsIn

Implement Scope ID lookup on GetLandData. Stacked regions were not handled

2011-01-03 19:40:55 +00:00

ServiceConnectorsOut

Merge branch 'master' into careminster-presence-refactor

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

World

Adapt to CM

2011-01-29 04:51:11 +00:00