Melanie c0f70d17fc Merge branch 'master' into careminster ...

Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs

2012-03-14 11:33:51 +00:00

..

ApplicationPlugins

Merge branch 'master' into careminster

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

Capabilities

Implement the FetchInventory2 capability. This accompanies the existing FetchInventoryDescendents2 capability.

2012-01-06 21:07:34 +00:00

ConsoleClient

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

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

Data

Merge branch 'master' into careminster

2012-03-14 11:33:51 +00:00

Framework

Merge branch 'master' into careminster

2012-03-14 11:33:51 +00:00

Region

Merge branch 'master' into careminster

2012-03-14 11:33:51 +00:00

Server

Merge branch 'master' into careminster

2012-03-14 11:33:51 +00:00

Services

Merge branch 'master' into careminster

2012-03-14 11:33:51 +00:00

Tests

BIG MESS. changed Iclient interface so only one event is used to inform scene about position scale or rotation change by client (others can be added). Its served at SceneGraph that does permition checks, undostore and sends down to SOG. changed values are stored in a class (ObjectChangeData) and what is changed as a enum (ObjectChangeWhat) with bit fields and 'macros' of this for better readability (at top of scenegraph.cs lasy to find better place for now) this can be extended for other things clients changes and need undo/redo. SOG process acording to what is changed. Changed UNDO/redo to use this also (warning is only storing what is changed, previus stored all, this must be checked for side efects. to save all PRS change commented line in scenegraph). Still have excessive calls to ScheduleGroupForTerseUpdate. **** UNTESTED ****

2012-03-10 20:32:19 +00:00

Tools

minor: Rename pCampbot console prompt to "pCampbot" rather than "Region"

2012-03-02 01:54:48 +00:00