aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/WorldMap (follow)
Commit message (Collapse)AuthorAgeFilesLines
* refactor: Move methods to start a monitored thread, start work in its own ↵Justin Clark-Casey (justincc)2014-11-251-1/+1
| | | | | | | | thread and run work in the jobengine from Watchdog to a WorkManager class. This is to achieve a clean separation of concerns - the watchdog is an inappropriate place for work management. Also adds a WorkManager.RunInThreadPool() class which feeds through to Util.FireAndForget. Also switches around the name and obj arguments to the new RunInThread() and RunJob() methods so that the callback obj comes after the callback as seen in the SDK and elsewhere
* Make "generate map" console command also trigger upload to maptiles as well ↵Justin Clark-Casey (justincc)2014-09-261-10/+34
| | | | as asset generation without performing tile generation twice.
* Eliminated common but un-useful log messagesOren Hurvitz2014-07-211-2/+4
|
* Minor: changed "existant" to "existent"Oren Hurvitz2014-07-211-2/+2
|
* Close streams immediately when we finish using themOren Hurvitz2014-07-211-5/+2
|
* Bug fix in map teleports in varregions. The cherry was missing from the ↵Diva Canto2014-06-211-26/+0
| | | | ice-cream Sunday: the packet itself was hardcoding the size of the region...
* This may fix mantis #7200, but I am unable to test because I don't have any ↵Diva Canto2014-06-011-0/+1
| | | | old viewers around anymore.
* Fix bug where setting a parcel in a varregion for sale would make sale ↵Justin Clark-Casey (justincc)2014-05-301-10/+21
| | | | | | bitmap generation in WorldMapModule throw an exception on next startup. This commit replaces the hardcoded region sizes in WorldMapModule.GenerateOverlay() with numbers pulled from m_scene.RegionInfo
* Fixes a bug where map search results pertaining to varregions would only ↵Diva Canto2014-05-272-20/+28
| | | | send the SW-most corner of the varregions; the other areas, when clicked, would result a blue circle, meaning that the viewer didn't know about those areas. This is still not quite right, as all the areas appear to be in the same coordinates, but it's good enough for now.
* Allow map searches for regions that contain the characters "!+|"Oren Hurvitz2014-05-211-20/+24
| | | | These characters are used as placeholders for other characters: ": /". But we should search first for the exact string the user entered, and only if that fails then replace the characters and search again.
* Non-functional changes of numbers into symbolic references and a fewRobert Adams2014-02-151-1/+1
| | | | comments on what variables really mean.
* Merge branch 'justincc-master'Justin Clark-Casey (justincc)2014-01-311-1/+1
|\
| * Make sure Web streams are disposed after useOren Hurvitz2014-01-311-1/+1
| |
* | varregion: enable teleporting to a varregion by clicking on the map andRobert Adams2014-01-261-78/+139
| | | | | | | | | | | | | | pressing the 'teleport' button. This commit adds returning region map info for all the subregions of a varregion. This also handles the selection of the extra region and then the displacement of the postion so the teleport is to the correct location.
* | Merge branch 'master' into varregionRobert Adams2014-01-261-42/+64
|\ \ | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
| * Properly dispose of drawing objects to reduce/stop memory leakage on ↵Justin Clark-Casey (justincc)2014-01-241-42/+49
| | | | | | | | generating map tiles with the MapImageModule and TexturedMapTileRenderer (the current defaults)
| * Add "generate map" console command to allow manual regeneration and storage ↵Justin Clark-Casey (justincc)2014-01-231-0/+15
| | | | | | | | | | | | of maptiles Primarily for test purposes though could be useful if one prefers to manually update the map tile
* | varregion: split up generated maptile images for storage in map. ThisRobert Adams2014-01-191-1/+1
| | | | | | | | makes maps for varregions show up properly.
* | varregion: many more updates removing the constant RegionSize and replacingRobert Adams2013-12-262-22/+19
| | | | | | | | with a passed region size. This time in the map code and grid services code.
* | varregion: rename 'LegacyRegionLocX' back to 'RegionLocX' and same for Y and Z.Robert Adams2013-12-141-11/+11
| | | | | | | | | | | | Rename 'RegionWorldLocX' to 'WorldLocX' and same for Y and Z. This keeps the downward compatibility and follows the scheme of 'region' and 'world' location naming that is happening in the Util module.
* | varregion: many replacements of in-place arithmetic with calls toRobert Adams2013-11-281-1/+1
| | | | | | | | | | the Util functions for converting world addresses to region addresses and converting region handles to locations.
* | Merge branch 'master' into varregionRobert Adams2013-10-161-1/+20
|\ \ | |/
| * * Refactorteravus2013-10-071-2/+2
| | | | | | | | * Break out common BasicDOSProtector code into separate class.
| * * Added a Basic DOS protection container/base object for the most common ↵teravus2013-10-071-1/+20
| | | | | | | | | | | | | | | | | | HTTP Server handlers. XMLRPC Handler, GenericHttpHandler and <Various>StreamHandler * Applied the XmlRpcBasicDOSProtector.cs to the login service as both an example, and good practice. * Applied the BaseStreamHandlerBasicDOSProtector.cs to the friends service as an example of the DOS Protector on StreamHandlers * Added CircularBuffer, used for CPU and Memory friendly rate monitoring. * DosProtector has 2 states, 1. Just Check for blocked users and check general velocity, 2. Track velocity per user, It only jumps to 2 if it's getting a lot of requests, and state 1 is about as resource friendly as if it wasn't even there.
* | VarRegion: change RegionInfo storage of region coordinates from regionRobert Adams2013-09-281-11/+11
|/ | | | | | | | count number to integer world coordinates. Added new methods RegionWorldLoc[XY]. Refactored name of 'RegionLoc*' to 'LegacyRegionLoc*' throughout OpenSim. Kept old 'RegionLoc*' entrypoint to RegionInfo for downward compatability of external region management packages.
* Removed the MapItems thread. Redirected the map items requests to the ↵Diva Canto2013-07-161-6/+43
| | | | services throttle thread. Didn't change anything in how that processor is implemented, for better or for worse.
* Make sure we dispose of WebResponse, StreamReader and Stream in various ↵Justin Clark-Casey (justincc)2013-02-271-16/+14
| | | | places where we were not already.
* Move map related settings from [Startup] to a new [Map] section in OpenSim.iniJustin Clark-Casey (justincc)2013-02-251-3/+6
| | | | | | | Existing map settings in [Startup] will continue to work, and if present will override anything in [Map] However, the proper place for such settings would now be [Map] This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings. This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings.
* Following on from 4f982596, launch map name requests on an async thread from ↵Justin Clark-Casey (justincc)2012-11-151-12/+8
| | | | | | LLClientView directly. This releases the inbound packet handling thread marginally quicker and is more consistent with the other async packet handling
* Another 10 modules' directives moved from .addin.xmlDiva Canto2012-11-122-0/+4
|
* Minor improvement in the MapSearchModule. Stop blocking the client thread if ↵Diva Canto2012-11-091-19/+55
| | | | the search takes too long.
* MapSearchModule also converted to new region module interface (37 to go).Diva Canto2012-11-091-5/+22
|
* Revert "Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-301-1/+0
| | | | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow." But the patch is here, in case anyone wants to try it. This reverts commit 531edd51d82ecd6a842a2611c99e9919634491ef.
* Added request.Proxy=null everywhere, as discussed in ↵Diva Canto2012-09-301-0/+1
| | | | | | http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow. Thanks R.Gunther (rigun@rigutech.nl) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
* 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
* minor: Make WORLD MAP category log lines consistentJustin Clark-Casey (justincc)2012-07-071-4/+4
|
* 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.
* 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.
* Fixed borkness with map search introduce by my last changes to it.Diva Canto2012-03-201-1/+1
|
* 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
|
* 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.
* Fixed two typos. White space cleanups.Kevin Cozens2012-02-281-16/+16
| | | | Signed-off-by: nebadon <michael@osgrid.org>
* 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.