OpenSimMirror/OpenSim/Region/Framework/Scenes
Melanie 24235006f4 Merge branch 'master' into bigmerge
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
	OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
2011-11-04 01:18:37 +00:00
..
Animation Fix ground sit autopilot 2011-10-25 00:53:39 +02:00
Scripting
Serialization Merge branch 'master' into bigmerge 2011-11-03 00:06:14 +00:00
Tests Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL. 2011-11-02 14:59:00 -07:00
Types remove unused BasicQuadTreeNode 2010-07-30 21:06:45 +01:00
AsyncInventorySender.cs minor: remove mono compiler warning 2011-07-11 02:11:37 +01:00
AsyncSceneObjectGroupDeleter.cs Merge commit 'a3531dec1aaafdcd22a70764cc512dd5666c75fc' into bigmerge 2011-10-11 23:08:18 +01:00
Border.cs
Cardinals.cs
CoalescedSceneObjects.cs refactor: move code to obtain the coalescence size and object offsets into CoalescedSceneObjects from the serializer. 2011-04-13 21:48:16 +01:00
EntityBase.cs remove some mono compiler warnings 2011-10-12 21:54:25 +01:00
EntityManager.cs remove mono compiler warnings 2010-12-17 22:35:08 +00:00
EventManager.cs Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
Prioritizer.cs Resolve merge commits, stage 1 2011-09-04 07:06:36 -07:00
RegionStatsHandler.cs remove the pointless slashes on the end of the (5!) different server stat retrieval mechanisms. 2011-10-07 00:30:35 +01:00
ReturnInfo.cs
Scene.Inventory.cs Merge commit 'c8304b7f84b1a8d9fb978cae510f684e36419deb' into bigmerge 2011-10-11 22:51:44 +01:00
Scene.PacketHandlers.cs Merge commit 'de19dc3024e5359f594d0a32c593d905163c24ea' into bigmerge 2011-10-11 21:21:44 +01:00
Scene.Permissions.cs Add a new ViewObjectInventory permission to decouple viewing from 2011-01-14 18:26:41 +01:00
Scene.cs Merge branch 'master' into bigmerge 2011-11-04 01:18:37 +00:00
SceneBase.cs Merge branch 'master' into bigmerge 2011-11-01 23:54:09 +00:00
SceneCommunicationService.cs Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmerge 2011-10-12 07:05:18 +01:00
SceneGraph.cs Merge branch 'master' into bigmerge 2011-11-04 01:18:37 +00:00
SceneManager.cs Rename ForEachAvatar back to ForEachScenePresence. The other changes 2011-11-03 17:53:51 -07:00
SceneObjectGroup.Inventory.cs Bring us up to date. 2011-09-14 19:11:32 -07:00
SceneObjectGroup.cs Merge branch 'master' into bigmerge 2011-11-04 01:18:37 +00:00
SceneObjectPart.cs Merge branch 'master' into bigmerge 2011-11-04 01:18:37 +00:00
SceneObjectPartInventory.cs Fix a missing locking call 2011-10-25 03:15:28 +02:00
ScenePresence.cs Merge branch 'master' into bigmerge 2011-11-04 01:18:37 +00:00
SceneViewer.cs Part 2 of see_into_this_sim_from_neighbor configuration option removal 2011-11-01 17:11:43 -07:00
SimStatsReporter.cs Tie reported FPS correction factor into the minimum frame time rather than setting separately. 2011-10-13 22:07:55 +01:00
TerrainChannel.cs
TerrainUtil.cs
UndoState.cs Merge branch 'master' into bigmerge 2011-11-03 00:06:14 +00:00
UuidGatherer.cs Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge 2011-10-25 03:19:55 +01:00