aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/WorldMap (follow)
Commit message (Collapse)AuthorAgeFilesLines
* put back the hack to make viewers display map tags (now and then at least) ↵UbitUmarov2015-09-191-127/+236
| | | | that i had removed and do it also on the local region. Make parcel overlay a bit less transparent than i did before.
* a few more changes to worldMap. Use ExpireCaches, cache remote mapItems ↵UbitUmarov2015-09-192-269/+196
| | | | requests, etc
* MapBlockFromGridRegion and Map2BlockFromGridRegion are the same thingUbitUmarov2015-09-182-62/+16
|
* sync remote responses for mapItens with the local ones, but sending all ↵UbitUmarov2015-09-171-18/+11
| | | | valid information, so later we can cache/throotle
* dont block a region just bc it doesnt have the requested map itemUbitUmarov2015-09-171-10/+0
|
* dont create terrain map asset for V1 viewers on large regions again, but do ↵UbitUmarov2015-09-171-165/+186
| | | | create parcel overlay since current viewers seem to use it (or we are missing something elsewhere)
* generate maptile assets again, v2 do use at least the parcels overlayUbitUmarov2015-09-171-2/+2
|
* merge issues and a few more changesUbitUmarov2015-09-171-152/+116
|
* remove bad merge code..UbitUmarov2015-09-171-14/+16
|
* mute watchdog timeouts on world map work threads. They do wait for events ↵UbitUmarov2015-09-151-2/+2
| | | | for a long time
* dont store/upload map asset for large regions, ( needs testing)UbitUmarov2015-09-061-2/+12
|
* at last we can login and see objects ( friends is dead and disable inUbitUmarov2015-09-031-2/+4
| | | | scenepresence)
* seems to compile ( tests comented out)UbitUmarov2015-09-022-440/+5
|
* bad merge?UbitUmarov2015-09-012-71/+635
|\
| * rename ImapTileModule as IMAPImageUploadModule to match coreUbitUmarov2015-08-241-3/+3
| |
| * more on world mapUbitUmarov2015-08-231-2/+19
| |
| * more fixes on mapUbitUmarov2015-08-231-1/+1
| |
| * Warp3D map now seems to workUbitUmarov2015-08-221-9/+42
| |
| * update MapSearchModuleUbitUmarov2015-08-222-17/+39
| |
| * fix worldMapModuleUbitUmarov2015-08-221-36/+102
| |
| * send regions size on map blocksUbitUmarov2015-08-201-0/+2
| |
| * Merge branch 'master' into careminsterMelanie2014-01-281-65/+61
| |\ | | | | | | | | | | | | | | | | | | | | | 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
| * \ Merge branch 'master' into careminsterMelanie2013-11-031-1/+20
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | Remove dumb "Region found!" message from map searchMelanie2013-05-061-2/+2
| | | |
| * | | Merge branch 'master' into careminsterMelanie2013-02-271-1/+1
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-261-3/+6
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-151-12/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
| * \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-132-0/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-11-111-6/+64
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| * \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-07-281-0/+1
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * \ \ \ \ \ \ \ \ Merge branch 'avination' into careminsterMelanie2012-07-112-277/+381
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs
| | * | | | | | | | | Reinstate parallel fetching of residents and remove a left over return from ↵Melanie2012-07-081-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | debugging
| | * | | | | | | | | Revamp map block sending to eliminate overload of the grid server connectionMelanie2012-07-081-96/+202
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and the sim's http client
| | * | | | | | | | | Instead of sending 20 records in 2 packets, send just one as we intended in ↵Melanie2012-07-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the first place.
| | * | | | | | | | | Address map lag issue seen with non-avination viewersMelanie2012-07-082-261/+257
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-07-111-4/+4
| |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-06-061-3/+4
| |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
| * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-05-051-8/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-211-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-03-181-2/+34
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-03-081-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-03-031-15/+15
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-02-241-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-02-051-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * | | | | | | | | | | | | | | | | | Draw brders around parcels for saleMelanie2012-01-311-11/+37
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Make parcel sale overlays work. No auction support.Melanie2012-01-311-4/+84
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Use the requested sim's map, not our ownMelanie2012-01-301-2/+2
| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Merge branch 'master' into careminsterMelanie2012-01-301-19/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-01-291-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into careminsterMelanie2012-01-261-11/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.1 at 2024-08-23 16:50:39 +0000