aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-02-013-28/+230
|\ | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-02-012-17/+221
| |\
| | * HG: This hopefully fixes the HG teleports back home to OSGrid. Looks like ↵Diva Canto2012-01-311-1/+1
| | | | | | | | | | | | Uri.ToString() drops the port when it's port 80.
| | * Add "show part uuid" and "show part name" console commands.Justin Clark-Casey (justincc)2012-01-311-7/+97
| | | | | | | | | | | | | | | | | | These commands will display part/prim details for a given uuid or name The "show object uuid" and "show object name" commands will now only display details for objects (i.e. not child parts in a linkset). This is for consistency with the "delete object" commands which only delete objects, not parts.
| | * Implement "show object name <name>" console command to show details of an ↵Justin Clark-Casey (justincc)2012-01-311-8/+49
| | | | | | | | | | | | object with the given name
| | * Get rid of the "no objects found" feedback for now - this doesn't work well ↵Justin Clark-Casey (justincc)2012-01-311-11/+13
| | | | | | | | | | | | if a command is executed over multiple scenes.
| | * Implement "show object uuid <uuid>" console command.Justin Clark-Casey (justincc)2012-01-311-5/+56
| | | | | | | | | | | | This will show details about a part with the given uuid if it's found.
| | * Add more user feedback if an object isn't found for which delete was requested.Justin Clark-Casey (justincc)2012-01-311-0/+15
| | |
| | * Add the name of a deleted object to the console outputJustin Clark-Casey (justincc)2012-01-311-1/+1
| | |
| | * If a particular region is selected in the console, only try to delete ↵Justin Clark-Casey (justincc)2012-01-311-16/+21
| | | | | | | | | | | | | | | | | | objects in that region, rather than in every region on the simulator The old wrong behaviour was in place before the command was extracted to a module.
| * | Prevent a changed attachment that has been saved from being saved again.Melanie2012-02-011-0/+1
| | |
| * | Straighten out some attachment mess. Don't save attachment states for HGMelanie2012-02-011-11/+8
| |/ | | | | | | | | visitors at all. On Leaving a sim, save only the changed ones. Don't save all scripted stuff when leaving a sim.
* | Merge branch 'master' into careminsterMelanie2012-01-311-0/+206
|\ \ | |/
| * Move object delete commands into a commands region module, in preparation ↵Justin Clark-Casey (justincc)2012-01-311-0/+206
| | | | | | | | for adding similar show commands.
| * 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' 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
| |