UbitUmarov 72684592ba Merge branch 'master' into avinationmerge ...

Conflicts:
	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Framework/Servers/ServerBase.cs
	OpenSim/Framework/VersionInfo.cs
	OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
	OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
	OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
	OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
	OpenSim/Services/HypergridService/GatekeeperService.cs
	OpenSim/Services/Interfaces/IAvatarService.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs

2015-11-01 03:01:59 +00:00

..

HttpServer

On to 0.8.3!

2015-10-18 21:51:49 -07:00

Properties

Bump version and assembly version numbers from 0.7.5 to 0.7.6

2013-02-05 00:23:17 +00:00

Tests

seems to compile ( tests comented out)

2015-09-02 19:54:53 +01:00

BaseOpenSimServer.cs

remove duplicated and breaking code

2015-09-21 17:59:44 +01:00

MainServer.cs

Fix regression tests relating to agent transfer by making simulator use last week's SIMULATOR/0.1 protocol for now.

2013-07-26 19:22:30 +01:00

ServerBase.cs

Merge branch 'master' into avinationmerge

2015-11-01 03:01:59 +00:00