aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/WorldMap (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| * Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵Justin Clark-Casey (justincc)2012-07-251-0/+1
| | | | | | | | with other monitoring code from OpenSim.Framework
* | 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
| * | minor: Make WORLD MAP category log lines consistentJustin Clark-Casey (justincc)2012-07-071-4/+4
| | |
* | | 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
| * | Actively dispose of Bitmaps in Warp3D image module and world map module once ↵Justin Clark-Casey (justincc)2012-06-061-3/+4
| | | | | | | | | | | | | | | | | | we've finished with them. This might help with memory leakage issues though I suspect it won't.
* | | 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
| * Implement optional name and description on http stream handlers so that we ↵Justin Clark-Casey (justincc)2012-05-031-8/+9
| | | | | | | | | | | | can relate a slow request to what the handler actually does and the agent it serves, if applicable. This is most useful for capabilities where the url is not self-describing.
* | Merge branch 'master' into careminsterMelanie2012-03-211-1/+1
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
| * Fixed borkness with map search introduce by my last changes to it.Diva Canto2012-03-201-1/+1
| |
* | 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
| * More on map search: send extra messages to the user regarding the region ↵Diva Canto2012-03-151-0/+11
| | | | | | | | being found or not, because the UI is horribly confusing -- places profile is always "loading..." whether the region exists or not.
| * More on SLURLs and V3. This is hacky, but it works. Basically, we have to ↵Diva Canto2012-03-151-3/+12
| | | | | | | | | | | | | | | | | | redefine the encoding of HG URLs because the viewer messes them up. Examples of what works and doesn't work: - secondlife://ucigrid00.nacs.uci.edu|8002/128/128 <-- works throughout the viewer - secondlife://http|!!ucigrid00.nacs.uci.edu|8002+Test+Zone+1/128/128 <-- works throughout the viewer - secondlife://http|!!grid.sciencesim.com!grid!hypergrid.php+Yellowstone01+74/128/128 <-- works throughout - secondlife://http%3A%2F%2Fucigrid00.nacs.uci.edu%3A8002%20UCI%20Central%201/128/128 <-- works in chat, but not as URLs in the webkit
| * Revert "Revert "More hacking around viewer bug""Diva Canto2012-03-151-1/+1
| | | | | | | | This reverts commit e5612553ce57b6e36cfa59db8450473099054da1.
| * These SLURLs are very confusing! -- reverting the revert. Hack is, indeed, ↵Diva Canto2012-03-151-1/+13
| | | | | | | | | | | | | | | | needed. Revert "Revert "Hack around https://jira.secondlife.com/browse/VWR-28570"" This reverts commit 5a9560db288a25799c93a3ecbd3544931149fa2a.
| * Revert "Hack around https://jira.secondlife.com/browse/VWR-28570"Diva Canto2012-03-151-13/+1
| | | | | | | | This reverts commit 697ac7fd9de244cb3b25ff8576838fd323b257c3.
| * Revert "More hacking around viewer bug"Diva Canto2012-03-151-1/+1
| | | | | | | | This reverts commit 10731732b4d40ec9d9e7a21f406a3d2b5dfc1075.
| * More hacking around viewer bugDiva Canto2012-03-151-1/+1
| |
| * Hack around https://jira.secondlife.com/browse/VWR-28570Diva Canto2012-03-151-1/+13
| |
* | Merge branch 'master' into careminsterMelanie2012-03-081-1/+1
|\ \ | |/
| * Change "help" to display categories/module list then "help ↵Justin Clark-Casey (justincc)2012-03-081-1/+1
| | | | | | | | | | | | | | | | | | | | | | <category/module>" to display commands in a category. This is to deal with the hundred lines of command splurge when one previously typed "help" Modelled somewhat on the mysql console One can still type help <command> to get per command help at any point. Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet). Does not affect command parsing or any other aspects of the console apart from the help system. Backwards compatible with existing modules.
* | 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
| * Fixed two typos. White space cleanups.Kevin Cozens2012-02-281-16/+16
| | | | | | | | Signed-off-by: nebadon <michael@osgrid.org>
* | Merge branch 'master' into careminsterMelanie2012-02-241-0/+1
|\ \ | |/
| * Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-241-0/+1
| | | | | | | | | | | | | | | | On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
* | Merge branch 'master' into careminsterMelanie2012-02-051-2/+2
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Quiet the map module loggingBlueWall2012-02-041-2/+2
| |
| * 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
| |
* | 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
|\ \ | |/
| * Patch in the rest of the maptile stuffMelanie2012-01-301-3/+7
| |
| * Next step for world map overlaysMelanie2012-01-301-2/+3
| |
| * Some plumbing for map overlaysMelanie2012-01-301-15/+20
| |
| * Pickup map overlay tile from RegionSettings.ParcelImageIDBlueWall2012-01-301-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-01-291-2/+2
|\ \ | |/
| * Adding our parcel's generated id to map packetsBlueWall2012-01-281-2/+2
| |
* | Merge branch 'master' into careminsterMelanie2012-01-261-11/+13
|\ \ | |/
| * Change references from sop to sog and add protection from null refBlueWall2012-01-261-11/+13
| | | | | | | | I had code made additions to the map module that was based on the earlier work that I did before Melanie made improvements. Updating the new code to incorporate the same changes.
* | Merge branch 'master' into careminsterMelanie2012-01-251-15/+66
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-251-2/+51
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| | * Telehub map items displayedBlueWall2012-01-241-3/+51
| | |
| * | Change the WorldMapModule to use SOG rather than SOP for the telehub ansMelanie2012-01-251-13/+15
| |/ | | | | | | cover a potential nullref
generated by cgit v1.1 at 2024-09-12 16:38:28 +0000