aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Plumb the rest of the context stuff. Well, what I see so far anywayMelanie Thielker2015-11-023-6/+16
|
* More EntityTransferContext plumbingMelanie Thielker2015-11-011-3/+5
|
* More plumbing of the EntityTransferContext (not yet complete)Melanie Thielker2015-11-011-3/+10
|
* Merge branch 'master' into avinationmergeUbitUmarov2015-11-011-8/+98
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Minor: Add an initializer to show what the default value would be.Melanie Thielker2015-11-011-1/+1
| |
| * Remove an unneeded code path, it could never be reached. Ubit caught itMelanie Thielker2015-11-011-12/+0
| | | | | | | | :)
| * This is the replacement fix for large regions and string version.Melanie Thielker2015-11-011-0/+6
| |
| * Revert "fix transfer protocol version in string format. These are notMelanie Thielker2015-11-011-17/+5
| | | | | | | | | | | | fixes you are looking for..... (Jedi mind trick) This reverts commit 19e5667451dc763eb90a78533c4fe7f51c49f9a0.
| * fix transfer protocol version in string format. Let that case have tests ↵UbitUmarov2015-10-311-5/+17
| | | | | | | | identical to new format (this still isnt for your babies keep them safe...)
| * Introduce an EntityTransferContext carrying the version numbers to passMelanie Thielker2015-10-311-14/+17
| | | | | | | | | | to all interested functions. Should fix the varregion conditional. Still a testing version, do NOT use in production!
| * Put back the option of having asymmetrical protocol versions inMelanie Thielker2015-10-311-25/+18
| | | | | | | | transfers
| * simplify new regions protocol version control. (May not work, and babies ↵UbitUmarov2015-10-311-27/+41
| | | | | | | | safety warnings still valid
| * Testing stage of the new versioning system. Use at own risk. May notMelanie Thielker2015-10-311-9/+94
| | | | | | | | work. Will eat your babies. Yada. Yada.
| * Let the initiator of a teleport or crossing know that we handle extraMelanie Thielker2015-10-201-0/+1
| | | | | | | | wearables
| * On to 0.8.3!Diva Canto2015-10-181-1/+1
| |
| * The protocol version checking on the grid server connector seemed to have a ↵Diva Canto2015-10-181-1/+18
| | | | | | | | bug. I think I fixed it.
* | On to 0.8.3!Diva Canto2015-10-181-1/+1
| | | | | | | | | | Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
* | The protocol version checking on the grid server connector seemed to have a ↵Diva Canto2015-10-171-1/+18
| | | | | | | | bug. I think I fixed it.
* | ... merge issueUbitUmarov2015-09-281-0/+2
| |
* | seems to compile ( tests comented out)UbitUmarov2015-09-024-48/+5
| |
* | bad merge?UbitUmarov2015-09-019-8/+358
|\ \ | |/ |/|
| * change default scopeID to UUID.ZeroUbitUmarov2015-08-293-3/+6
| |
| * add more of the v03 checks and homeURL. Sending side only for nowUbitUmarov2015-08-261-2/+14
| |
| * varregion: any conversions of use of Constants.RegionSize converted intoRobert Adams2015-03-292-2/+2
| | | | | | | | Util.cs routines to convert region coords to and from world coords or handles.
| * Fix content type checking to confirm to newer core versionsMelanie Thielker2015-03-101-1/+1
| |
| * TEST**** wingridproxy detection at grid login. Untested possible notUbitUmarov2014-10-241-3/+8
| | | | | | | | | | very reliable. Adds some load even on region servers because of code at BaseHttpServer.
| * Fix a string formatMelanie Thielker2014-09-241-1/+1
| |
| * make CreateAgent sync for logins, async for other casesUbitUmarov2014-09-241-13/+18
| |
| * coment out stack trace at newUserConnection, add log msh at createAgentUbitUmarov2014-09-241-2/+3
| |
| * TEST do createAgent sync, forcing grid services and other regions to waitUbitUmarov2014-09-241-2/+7
| | | | | | | | for it to complet. This is not that good, but maybe needed
| * If GridUserService is asked for a nonexistent user, bail gracefullyMelanie Thielker2014-08-231-0/+3
| |
| * Change the map tile system to be multi-grid hosting compatibleMelanie Thielker2014-08-233-3/+19
| |
| * Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-2131-332/+875
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * Revert "Add support for user preferences (im via email)"Melanie2013-12-072-55/+0
| | | | | | | | | | | | This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
| | * Merge branch 'master' into careminsterMelanie2013-12-072-0/+55
| | |\
| | * \ Merge branch 'master' into careminsterMelanie2013-11-032-1/+25
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * \ \ Merge branch 'master' into careminsterMelanie2013-10-063-1/+58
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| | * \ \ \ Merge branch 'master' into careminsterMelanie2013-09-071-0/+33
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-08-173-10/+4
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
| | * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-1821-128/+50
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs OpenSim/Services/HypergridService/UserAgentService.cs
| | * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-041-2/+4
| | |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-301-7/+5
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Region/Framework/Scenes/EventManager.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-234-181/+100
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-131-1/+1
| | |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminsterMelanie2013-06-061-5/+0
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-06-042-0/+580
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-165-7/+26
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * | | | | | | | | | | | | | | Add forgotten fileMelanie Thielker2014-06-211-0/+249
| |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-02-281-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
generated by cgit v1.1 at 2024-12-19 12:55:15 +0000