aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/World/WorldMap (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-07-281-0/+1
|\
| * Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring wi...Justin Clark-Casey (justincc)2012-07-251-0/+1
* | Merge branch 'avination' into careminsterMelanie2012-07-112-277/+381
|\ \
| * | Reinstate parallel fetching of residents and remove a left over return from d...Melanie2012-07-081-5/+7
| * | Revamp map block sending to eliminate overload of the grid server connectionMelanie2012-07-081-96/+202
| * | Instead of sending 20 records in 2 packets, send just one as we intended in t...Melanie2012-07-081-1/+1
| * | Address map lag issue seen with non-avination viewersMelanie2012-07-082-261/+257
* | | Merge branch 'master' into careminsterMelanie2012-07-111-4/+4
|\ \ \ | | |/ | |/|
| * | 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
|\ \ \ | |/ /
| * | Actively dispose of Bitmaps in Warp3D image module and world map module once ...Justin Clark-Casey (justincc)2012-06-061-3/+4
* | | Merge branch 'master' into careminsterMelanie2012-05-051-8/+9
|\ \ \ | |/ / | | / | |/ |/|
| * Implement optional name and description on http stream handlers so that we ca...Justin Clark-Casey (justincc)2012-05-031-8/+9
* | Merge branch 'master' into careminsterMelanie2012-03-211-1/+1
|\ \ | |/
| * 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
|\ \ | |/
| * More on map search: send extra messages to the user regarding the region bein...Diva Canto2012-03-151-0/+11
| * More on SLURLs and V3. This is hacky, but it works. Basically, we have to red...Diva Canto2012-03-151-3/+12
| * Revert "Revert "More hacking around viewer bug""Diva Canto2012-03-151-1/+1
| * These SLURLs are very confusing! -- reverting the revert. Hack is, indeed, ne...Diva Canto2012-03-151-1/+13
| * Revert "Hack around https://jira.secondlife.com/browse/VWR-28570"Diva Canto2012-03-151-13/+1
| * Revert "More hacking around viewer bug"Diva Canto2012-03-151-1/+1
| * 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 <category/module>"...Justin Clark-Casey (justincc)2012-03-081-1/+1
* | Merge branch 'master' into careminsterMelanie2012-03-031-15/+15
|\ \ | |/
| * Fixed two typos. White space cleanups.Kevin Cozens2012-02-281-16/+16
* | 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
* | Merge branch 'master' into careminsterMelanie2012-02-051-2/+2
|\ \ | |/
| * 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
* | Merge branch 'master' into careminsterMelanie2012-01-251-15/+66
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-01-251-2/+51
| |\
| | * 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
| |/