OpenSimMirror/OpenSim/Region/ClientStack/Linden/Caps
Dan Lake 30a9cee425 Merge branch 'master' into dev
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/ObjectCaps/UploadObjectAssetModule.cs
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/UndoState.cs
2011-07-20 14:35:06 -07:00
..
BunchOfCaps minor: method doc for baked texture uploading 2011-07-15 22:58:29 +01:00
EventQueue Merge branch 'master' into dev 2011-05-05 14:24:27 -07:00
ObjectCaps Merge branch 'master' into dev 2011-07-20 14:35:06 -07:00
GetMeshModule.cs Test m_Enabled on RemoveRegion. 2011-05-04 20:40:25 -07:00
GetTextureModule.cs Test m_Enabled on RemoveRegion. 2011-05-04 20:40:25 -07:00
MeshUploadFlagModule.cs Fix permissions problem where newly uploaded meshes rezzed from inventory could not be copied by owner. 2011-07-11 22:56:14 +01:00
NewFileAgentInventoryVariablePriceModule.cs Fix permissions problem where newly uploaded meshes rezzed from inventory could not be copied by owner. 2011-07-11 22:56:14 +01:00
SimulatorFeaturesModule.cs Added SimulatorFeatures capability. Thanks Aurora devs for the bootstrap on the contents of the response. 2011-06-13 10:21:29 -07:00
WebFetchInvDescModule.cs Test m_Enabled on RemoveRegion. 2011-05-04 20:40:25 -07:00