aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-01-303-8/+17
|\ \ | | | | | | | | | careminster
| * | Add the ability to abort a pending restart using the viewer UI or aMelanie2012-01-282-0/+9
| | | | | | | | | | | | RemoteAdmin message
| * | Fix calculating land prim count type width issueMelanie2012-01-281-8/+8
| | |
* | | Merge branch 'master' into careminsterMelanie2012-01-292-4/+3
|\ \ \ | |/ / |/| / | |/
| * Merge branch 'master' of /home/opensim/var/repo/opensim into mapworkBlueWall2012-01-284-14/+89
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-01-284-14/+89
| | |\
| * | | Adding our parcel's generated id to map packetsBlueWall2012-01-281-2/+2
| |/ /
| * | Send CHANGED_TELEPORT during local TP again - partially revert ↵Bo Iwu2012-01-281-2/+1
| | | | | | | | | | | | | | | | | | cf73afec356eed30e169be3ce71edad89b4fdb37 Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | | Merge branch 'master' into careminsterMelanie2012-01-284-14/+89
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * | Add experimental --publish option to "save oar" so that OARs reloaded to the ↵Justin Clark-Casey (justincc)2012-01-284-14/+89
| |/ | | | | | | same grid don't have the publisher as owner.
* | Merge branch 'master' into careminsterMelanie2012-01-281-1/+1
|\ \ | |/
| * Remove IClientAPI from the money module. It was only used to pass in theMelanie2012-01-281-1/+1
| | | | | | | | agent id anyway
* | 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-262-3/+12
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Update save oar and save iar help responses to reflect new -h|--homenebadon2012-01-251-2/+2
| | | | | | | | | | switches which replace -p|--profile ie: "save oar --home=http://hg.osgrid.org:80 region.oar"
| * llGetParcelMusicURL implementation ↵Pixel Tomsen2012-01-251-1/+10
| | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlGetParcelMusicURL Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
* | 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
* | Merge branch 'master' into careminsterMelanie2012-01-251-0/+18
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs
| * Put Telehubs on the mapBlueWall2012-01-241-0/+18
| |
| * Simplify and streamline telehub editing code. Verify rotations and fixMelanie2012-01-242-58/+30
| | | | | | | | spwan point positioning on rotated telehubs.
| * Reverse the spawn point distance vectorMelanie2012-01-241-1/+1
| |
| * Correct a coordinate to make the viewer like itMelanie2012-01-241-1/+1
| |
* | Simplify and streamline telehub editing code. Verify rotations and fixMelanie2012-01-242-58/+30
| | | | | | | | spwan point positioning on rotated telehubs.
* | Reverse the spawn point distance vectorMelanie2012-01-241-1/+1
| |
* | Correct a coordinate to make the viewer like itMelanie2012-01-241-1/+1
| |
* | Merge branch 'master' into careminsterMelanie2012-01-242-94/+85
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/RegionSettings.cs
| * Change Telehubs to store only the data that is really needed and notMelanie2012-01-242-83/+65
| | | | | | | | additional redundant information.
| * Add update to Telehub position and rotation before adding SpawnPointsBlueWall2012-01-231-4/+11
| |
| * Cleanup BlueWall2012-01-231-3/+6
| |
| * Cleanup unused parts, add some error handlingBlueWall2012-01-231-53/+52
| |
* | Merge branch 'master' into careminsterMelanie2012-01-222-70/+91
|\ \ | |/ | | | | | | Conflicts: OpenSim/Framework/RegionSettings.cs
| * Move Telehub tables and data from EstateSettings to RegionSettings.Melanie2012-01-222-30/+28
| | | | | | | | | | | | | | | | | | | | This is damage control es EstateSettings is not the place this can be put. EstateSettings is nt unique to a region and therefore would introduce a hard limit of one telehub per estate, completely shutting off the option of having SL style telehubs, e.g. one per region. Whole estate teleport routing can still be implemented id desiresd, this way all options are open while the other way most options get closed off.
| * Telehub Support:BlueWall2012-01-212-69/+92
| | | | | | | | Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented.
* | Merge branch 'master' into careminsterMelanie2012-01-214-2/+197
|\ \ | |/
| * Telehub Support:BlueWall2012-01-202-1/+194
| | | | | | | | Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
| * Add basic request and send image regression tests for LLImageManagerJustin Clark-Casey (justincc)2012-01-191-1/+1
| |
| * RegionReady:BlueWall2012-01-181-0/+2
| | | | | | | | Back out some of the oar monitoring for the time being. Need to find a better way to get feedback. Will re-visit this soon.
| * Allow retrival of multiple user records in one operation, analog to presenceMelanie2012-01-162-0/+9
| |
generated by cgit v1.1 at 2025-01-18 12:49:40 +0000