aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Because there's no such thing as too much culture. (looking forward to .NET ↵Diva Canto2016-06-221-0/+2
| | | | 4.5 to set this globally)
* Missing AsBooleanDiva Canto2016-06-221-1/+1
|
* fix protocol version to max wearables mappingUbitUmarov2015-12-011-1/+3
|
* Fix protocol versions to wearables count mappingMelanie Thielker2015-12-011-1/+3
|
* Set wearables count to max legacy wearables for version < 0.4Melanie Thielker2015-11-021-0/+5
|
* Plumb the rest of the context stuff. Well, what I see so far anywayMelanie Thielker2015-11-021-0/+4
|
* More EntityTransferContext plumbingMelanie Thielker2015-11-011-4/+2
|
* More plumbing of the EntityTransferContext (not yet complete)Melanie Thielker2015-11-011-8/+9
|
* Merge branch 'master' into avinationmergeUbitUmarov2015-11-011-0/+2
|\
| * Plumb the special VeriableWearablesSuported field which we willMelanie Thielker2015-11-011-0/+2
| | | | | | | | temporarily use to determine extended wearableness
* | Merge branch 'master' into avinationmergeUbitUmarov2015-11-011-10/+29
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Introduce an EntityTransferContext carrying the version numbers to passMelanie Thielker2015-10-311-7/+10
| | | | | | | | | | 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-3/+5
| | | | | | | | transfers
| * simplify new regions protocol version control. (May not work, and babies ↵UbitUmarov2015-10-311-2/+2
| | | | | | | | safety warnings still valid
| * fix teleport to to string version regionsUbitUmarov2015-10-311-1/+1
| |
| * Testing stage of the new versioning system. Use at own risk. May notMelanie Thielker2015-10-311-8/+24
| | | | | | | | work. Will eat your babies. Yada. Yada.
* | seems to compile ( tests comented out)UbitUmarov2015-09-021-22/+2
| |
* | bad merge?UbitUmarov2015-09-011-0/+21
|\ \ | |/ |/|
| * add more of the v03 checks and homeURL. Sending side only for nowUbitUmarov2015-08-261-2/+6
| |
| * Merge branch 'master' into careminsterMelanie2013-07-181-58/+13
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-9/+22
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 careminsterMelanie2012-12-091-1/+1
| |\ \ \
| * | | | Make friend notifies and closing child agents async because both canMelanie2012-09-041-10/+11
| | | | | | | | | | | | | | | | | | | | block the heartbeat thread if the sim being contacted is unresponsive
| * | | | Add a reason message for a code path that lacks oneMelanie2012-08-031-0/+1
| | | | |
| * | | | Merge branch 'master' into careminsterMelanie2012-05-271-14/+25
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-02-231-1/+2
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-02-201-6/+17
| |\ \ \ \ \ \
| * | | | | | | Prevent object loss and positioning outside the region with failed object simMelanie2012-02-141-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | crossings
| * | | | | | | Merge branch 'master' into bigmergeMelanie2011-11-191-1/+1
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-06-091-6/+21
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Also compress the actual fatpacksMelanie2011-05-081-1/+6
| | | | | | | | | |
| * | | | | | | | | Enable compressed (gzip) fatpack transfers.Melanie2011-05-081-5/+14
| | | | | | | | | |
| * | | | | | | | | Attempt to make teleports more reliable. This may break redirection on loginMelanie2011-05-031-1/+1
| | | | | | | | | |
| * | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-031-16/+19
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-04-301-7/+12
| |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Make the login service's call to the sim time out quicker so we have aMelanie2011-03-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | chance to try fallback before the client quits
| * | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-03-101-3/+3
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-02-191-2/+6
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Change the QUERYACCESS method to eliminate spurious access denied messagesMelanie2011-02-161-1/+16
| | | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-02-071-3/+52
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs OpenSim/Services/GridService/HypergridLinker.cs
| * | | | | | | | | | | | | | Make the new style stuff compatible with the older revisionMelanie2011-01-281-1/+14
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix up QueryAccess to also check parcelsMelanie2011-01-281-3/+7
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-181-3/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-01-061-446/+111
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Revise Materials properties; Fix Double-Click Autopilot; Allow non-script ↵Kitto Flora2011-01-041-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | sit positions >= 0.1M; Add llLookAt(); Comment out spammy bad adjacent sim message.
| * | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-121-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminster-presence-refactorMelanie2010-12-091-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-091-0/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | whether or not an agent is allowed there as a root agent.
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-061-50/+7
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Change the way attachments are persisted. Editing a worn attachment will nowMelanie2010-11-161-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.