aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Services/Interfaces (follow)
Commit message (Collapse)AuthorAgeFilesLines
* revert previus commitUbitUmarov2015-11-231-1/+1
|
* remove libomv detection/log from llLoginServiceUbitUmarov2015-11-231-1/+1
|
* More EntityTransferContext plumbingMelanie Thielker2015-11-011-14/+0
|
* More plumbing of the EntityTransferContext (not yet complete)Melanie Thielker2015-11-012-3/+4
|
* 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-012-8/+18
|\ \ | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+13
| | | | | | | | | | to all interested functions. Should fix the varregion conditional. Still a testing version, do NOT use in production!
| * Testing stage of the new versioning system. Use at own risk. May notMelanie Thielker2015-10-311-1/+1
| | | | | | | | work. Will eat your babies. Yada. Yada.
| * fix services handling of visualparameters, avoiding possible crashs (mantis ↵UbitUmarov2015-10-271-5/+20
| | | | | | | | 7732) partially appling code from avinationmerge
| * On to 0.8.3!Diva Canto2015-10-181-1/+1
| |
* | On to 0.8.3!Diva Canto2015-10-181-1/+1
| | | | | | | | | | Conflicts: OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
* | Remove the last proprietary copyright headers, insert BSD ones.Melanie Thielker2015-09-131-6/+27
| |
* | seems to compile ( tests comented out)UbitUmarov2015-09-025-137/+20
| |
* | bad merge?UbitUmarov2015-09-0110-16/+193
|\ \ | |/ |/|
| * add more of the v03 checks and homeURL. Sending side only for nowUbitUmarov2015-08-261-1/+13
| |
| * varregion: any conversions of use of Constants.RegionSize converted intoRobert Adams2015-03-291-8/+8
| | | | | | | | Util.cs routines to convert region coords to and from world coords or handles.
| * bug fixUbitUmarov2014-10-261-1/+1
| |
| * TEST**** wingridproxy detection at grid login. Untested possible notUbitUmarov2014-10-241-2/+2
| | | | | | | | | | very reliable. Adds some load even on region servers because of code at BaseHttpServer.
| * Merge branch 'avination-current'Melanie Thielker2014-08-231-0/+6
| |\
| | * Fix a null ref that will cause an exception if a grid region doesnt' specify ↵Melanie Thielker2014-08-231-0/+6
| | | | | | | | | | | | a URI.
| | * Change the map tile system to be multi-grid hosting compatibleMelanie Thielker2014-08-231-3/+3
| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Server/Handlers/Map/MapRemoveServerConnector.cs
| * | Change the map tile system to be multi-grid hosting compatibleMelanie Thielker2014-08-231-3/+3
| | |
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterMelanie Thielker2014-06-217-20/+179
| |\ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * Merge branch 'master' into careminsterMelanie2014-01-281-0/+7
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Interfaces/IInterregionComms.cs OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
| | * \ Intermediate commit. Sill errors.Melanie2014-01-051-0/+41
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge branch 'master' into careminster Conflicts: OpenSim/Data/SQLite/SQLiteUserProfilesData.cs OpenSim/Framework/RegionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Services/UserProfilesService/UserProfilesService.cs
| | * | | Revert "Add support for user preferences (im via email)"Melanie2013-12-071-5/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 1842388bb4dcf5ecd57732ffa877b6ca1a3dec7b.
| | * | | Merge branch 'master' into careminsterMelanie2013-12-072-3/+5
| | |\ \ \
| | * \ \ \ Merge branch 'master' into careminsterMelanie2013-10-061-1/+1
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
| | * \ \ \ \ Merge branch 'master' into careminsterMelanie2013-09-071-0/+1
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/Framework/Scenes/Scene.cs
| | * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-09-011-1/+4
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Region/RestartModule.cs OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| | * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-181-11/+1
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-4/+1
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-041-0/+75
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| | * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-04-291-0/+48
| | |\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add delete maptile ability to MapImageService - yet untestedMelanie Thielker2014-03-181-0/+1
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge branch 'avination' into careminsterMelanie2013-03-061-4/+17
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| | * | | | | | | | | | | Multiattach, part 2Melanie2013-03-051-3/+9
| | | | | | | | | | | | |
| | * | | | | | | | | | | Multiattach, part 1Melanie2013-03-051-1/+8
| | | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-02-221-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-051-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-12-211-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Add the interfaces for the new Avination baked texture cache serviceMelanie2012-12-191-0/+17
| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'avination' into careminsterMelanie2012-12-181-1/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | add some default size setting and checksUbitUmarov2012-12-071-1/+6
| | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | revert the use of avatar skeleton and use avatar size provided by viewers,UbitUmarov2012-12-071-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | since at least for now seems good enought
| * | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-12-041-0/+115
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
| * | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-11-171-0/+33
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-10-311-1/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/ChildAgentDataUpdate.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-10-201-1/+37
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-12-25 13:21:04 +0000