opensim

mirror of https://github.com/opensim/opensim.git synced 2026-06-01 23:45:44 +08:00

Files

Melanie 75c68fa29e Merge branch 'master' into careminster

Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs

2013-10-04 20:03:12 +01:00

Agent

Merge branch 'master' into careminster

2013-10-04 20:03:12 +01:00

Asset

Revert "Merge master into teravuswork", it should have been avination, not master.

2012-11-15 10:05:16 -05:00

Avatar

Merge branch 'master' into careminster

2013-09-01 22:49:31 +01:00

Example

minor: Quieten down the parts of the WebSocketEcho module logging for now where it tells us it is added/loaded/removed from regions

2013-03-02 01:06:08 +00:00

Framework/Monitoring

Make general server stats available on the robust console as well as the simulator console

2013-06-17 22:39:00 +01:00

Materials

Try naming the materials handlers again, this time registering the POST as RenderMaterials

2013-07-11 23:51:10 +01:00

PhysicsParameters

Change passed PhysicsParameter value from float to the more general string value

2013-02-07 11:10:14 -08:00

PrimLimitsModule

Merge branch 'master' into careminster

2013-03-01 23:54:00 +00:00

Properties

Deleted all AssemblyFileVersion directives

2013-02-19 17:14:55 -08:00

Scripting

Merge branch 'master' into careminster

2013-10-04 20:03:12 +01:00

ServiceConnectorsIn/Freeswitch

Remove any mention of IRegionModule from region names and comments to aid

2012-11-12 19:18:20 +00:00

ViewerSupport

Merge branch 'master' into careminster

2013-07-18 10:08:10 +01:00

World

Merge branch 'master' into careminster

2013-10-04 20:03:12 +01:00

README

reformatting README (just noticed that that line was a bit on the long

2009-03-19 08:47:05 +00:00

README

= OpenSim.Region.OptionalModules =

The modules in this part of the OpenSim source tree are candidates for
forge. For the time being, until we have reached consensus on

    (a) what should be core or optional
    (b) that we have reached a stable API
    (c) how to maintain optional modules

we will keep these modules in-tree.