aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Server/Handlers/Simulation (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Plumb the rest of the context stuff. Well, what I see so far anywayMelanie Thielker2015-11-021-4/+14
|
* 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
* | seems to compile ( tests comented out)UbitUmarov2015-09-021-23/+2
| |
* | bad merge?UbitUmarov2015-09-011-0/+39
|\ \ | |/ |/|
| * add more of the v03 checks and homeURL. Sending side only for nowUbitUmarov2015-08-261-2/+14
| |
| * Fix content type checking to confirm to newer core versionsMelanie Thielker2015-03-101-1/+1
| |
| * 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
| * Merge branch 'master' into careminsterMelanie2013-07-181-88/+17
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-06-231-27/+50
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-05-161-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | Make agent creation at destination asynchronous. Failures here are prettyMelanie2012-09-161-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | much guaranteed to be fatal and the few times this would dosconnect an agent are more than made up for by the increased throughput of replying and closing the connection vs. keeping it open during the heavy work. Also causes better feedback to the viewer as the time is now split between Requesting Teleport and Connectiong to Destination.
| * | | | Merge branch 'master' into careminsterMelanie2012-07-011-48/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-272-5/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Data/MySQL/Resources/RegionStore.migrations OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-03-141-7/+12
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-02-231-3/+7
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * \ \ \ \ \ \ \ Merge branch 'master' into bigmergeMelanie2011-12-051-2/+2
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge branch 'master' into bigmergeMelanie2011-11-191-4/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-05-131-0/+2
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Also compress the actual fatpacksMelanie2011-05-082-94/+171
| | | | | | | | | | | |
| * | | | | | | | | | | Remove a spammy debug I left in. Disable TP cancel button at the pointMelanie2011-05-081-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of no return.
| * | | | | | | | | | | Enable compressed (gzip) fatpack transfers.Melanie2011-05-082-131/+191
| | | | | | | | | | | |
| * | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-301-3/+6
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Change the QUERYACCESS method to eliminate spurious access denied messagesMelanie2011-02-161-2/+9
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-121-0/+5
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix up QueryAccess to also check parcelsMelanie2011-01-281-1/+8
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Make bans work for teleport. Now teleport will complete block if the userMelanie2011-01-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is not allowed on the estate. If the user is allowed on no parcel, the teleport will also be blocked. If the user is allowed on a parcel, but not the desired one, the user will be shifted to the closest allowed location.
| * | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-231-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-01-181-4/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-091-20/+31
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-091-0/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whether or not an agent is allowed there as a root agent.
| * | | | | | | | | | | | | | | | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | save properly, as will the results of a resizer script working. Attachment positions are no longer saved on each move, but instead are saved once on logout. Attachment script states are saved as part of the attachment now when detaching.
| * | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-10-041-1/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-09-051-18/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-08-211-0/+20
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-06-301-1/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-12-24 22:54:24 +0000