ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-02 00:15:45 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
d9b149b3756442224492ca24c2be3196a873489a
opensim/OpenSim/Region/CoreModules
History
Melanie d9b149b375 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
	OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
	OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-11-12 15:46:45 +00:00
..
Agent
Merge branch 'master' into careminster
2012-11-12 15:46:45 +00:00
Asset
Merge branch 'master' into careminster
2012-11-11 16:31:01 +00:00
Avatar
Merge branch 'master' into careminster
2012-11-11 16:31:01 +00:00
Framework
Fix mantis #6425
2012-11-11 21:13:14 -08:00
Hypergrid
Revamp map block sending to eliminate overload of the grid server connection
2012-07-08 10:44:53 +02:00
Resources
One more module converted: CloudModule.
2012-11-10 11:59:08 -08:00
Scripting
Merge branch 'master' into careminster
2012-11-12 15:46:45 +00:00
ServiceConnectorsIn
Comment out the neighbour and land in connectors from info logging that they are starting up
2012-06-20 00:42:54 +01:00
ServiceConnectorsOut
Merge commit '3c77b8f463a852aecf3cb29fe4e5f4614f474dbf' into careminster
2012-09-27 15:46:35 +01:00
World
Merge branch 'master' into careminster
2012-11-12 15:46:45 +00:00