aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Interfaces (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into avinationmergeUbitUmarov2015-11-011-6/+7
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-3/+3
| | | | | | | | | | 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-3/+3
| | | | | | | | work. Will eat your babies. Yada. Yada.
* | remove unused method parameter master also removedUbitUmarov2015-10-021-1/+1
| |
* | add several options for NPC creation so abusive use can be reduced ↵UbitUmarov2015-09-301-0/+12
| | | | | | | | (restrictive by default) UNTESTED
* | MapBlockFromGridRegion and Map2BlockFromGridRegion are the same thingUbitUmarov2015-09-181-1/+0
| |
* | try to improve vehicles crossing with Xengine. Lag seems main issue now, ↵UbitUmarov2015-09-141-2/+2
| | | | | | | | but needs testing, specially the fail cases, that most likelly need more work
* | Remove the last proprietary copyright headers, insert BSD ones.Melanie Thielker2015-09-132-12/+52
| |
* | seems to compile ( tests comented out)UbitUmarov2015-09-027-43/+2
| |
* | bad merge?UbitUmarov2015-09-0121-14/+124
|\ \ | |/ |/|
| * try to implement core load oar optionsUbitUmarov2015-08-242-18/+12
| |
| * rename ImapTileModule as IMAPImageUploadModule to match coreUbitUmarov2015-08-241-1/+1
| |
| * Warp3D map now seems to workUbitUmarov2015-08-221-0/+2
| |
| * update MapSearchModuleUbitUmarov2015-08-221-0/+5
| |
| * find sending of initial terrain using PushTerrain as os coreUbitUmarov2015-08-191-1/+8
| |
| * varregion: refactor use of 'double heightmap[,]' into references to new ↵Robert Adams2015-03-273-2/+36
| | | | | | | | | | | | class TerrainData and push the implementation from Scene into the database readers and writers.
| * Varregion: first cut at removing Border class checks for region crossings.Robert Adams2015-03-221-0/+5
| | | | | | | | | | Added Scene.PositionIsInCurrentRegion(pos) to sense when new position needs some crossing work. Many changes made to EntityTransferModule to accomodate new crossing sense logic.
| * return bbox and offsetHeight to RezObjectUbitUmarov2014-11-191-1/+1
| |
| * Remove the Invisible stuff and add more baked caching. Refactor selection of ↵Melanie Thielker2014-11-111-1/+1
| | | | | | | | textures to save to Bakes module.
| * Add a new baked texure module methid to support baked texturing mesh avatarsMelanie Thielker2014-11-101-0/+1
| |
| * try to make SOG crossings full async. Simplify some borders checking....UbitUmarov2014-10-241-2/+4
| |
| * do agent crossing async, including QUERYACCESS ( need to check vehicles forUbitUmarov2014-10-211-0/+1
| | | | | | | | this also ), so it doesn't stop heartbeat
| * Merge branch 'avination-current'Melanie Thielker2014-08-231-0/+40
| |\
| | * Add an admin message to refesh a region's map tile. Will be used to periodicallyMelanie Thielker2014-08-231-0/+40
| | | | | | | | | | | | rebuild the world map to clean out unused tiles.
| * | change how sounds work. May be bad.. needs testingUbitUmarov2014-07-271-1/+1
| | |
| * | Merge branch 'master' into careminsterMelanie2014-01-283-119/+27
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-052-10/+32
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * \ \ \ Merge branch 'master' into careminsterMelanie2013-11-032-4/+11
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-08-011-0/+48
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-292-1/+3
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-07-241-0/+19
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * \ \ \ \ \ \ \ Merge branch 'avination-current' into careminsterMelanie2013-06-062-0/+53
| |\ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs OpenSim/Region/Framework/Interfaces/IDynamicMenuModule.cs OpenSim/Region/OptionalModules/ViewerSupport/DynamicMenuModule.cs OpenSim/Region/OptionalModules/World/MoneyModule/SampleMoneyModule.cs
| | * | | | | | | Small adjustments to the floater moduleMelanie2013-05-131-1/+1
| | | | | | | | |
| | * | | | | | | Add RegionManager level and the ability to use literal XML to the dynamic ↵Melanie2013-05-042-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | floater module
| | * | | | | | | Controller module for dynamic floaters (WIP)Melanie2013-04-271-0/+51
| | | | | | | | |
| | * | | | | | | Adding the dynamic menu module which allows registering new menu options in ↵Melanie2013-04-251-0/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compliant viewers
| * | | | | | | | Merge branch 'master' into careminsterMelanie2013-05-241-1/+7
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-05-081-1/+1
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-04-251-0/+57
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-03-291-0/+3
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * \ \ \ \ \ \ \ \ \ \ Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminsterMelanie2013-03-291-2/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
| * \ \ \ \ \ \ \ \ \ \ \ Merge commit '4ad9b275302ee109937512963eab095ff542a0c7' into careminsterMelanie2013-03-291-0/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-03-081-1/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2013-03-061-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| | * | | | | | | | | | | | | | Multiattach, part 1Melanie2013-03-051-1/+1
| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'avination' into careminsterMelanie2013-03-031-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
| | * | | | | | | | | | | | | | Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-181-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | there was a handler for it.
| * | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2013-02-271-0/+11
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-221-1/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2013-02-151-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
generated by cgit v1.1 at 2024-08-24 06:33:53 +0000