Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2012-02-01 | 3 | -28/+230 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/XEngine/XEngine.cs | ||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-02-01 | 2 | -17/+221 |
| |\ | |||||
| | * | HG: This hopefully fixes the HG teleports back home to OSGrid. Looks like ↵ | Diva Canto | 2012-01-31 | 1 | -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-31 | 1 | -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-31 | 1 | -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-31 | 1 | -11/+13 |
| | | | | | | | | | | | | if a command is executed over multiple scenes. | ||||
| | * | Implement "show object uuid <uuid>" console command. | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -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-31 | 1 | -0/+15 |
| | | | |||||
| | * | Add the name of a deleted object to the console output | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -1/+1 |
| | | | |||||
| | * | If a particular region is selected in the console, only try to delete ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -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. | Melanie | 2012-02-01 | 1 | -0/+1 |
| | | | |||||
| * | | Straighten out some attachment mess. Don't save attachment states for HG | Melanie | 2012-02-01 | 1 | -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 careminster | Melanie | 2012-01-31 | 1 | -0/+206 |
|\ \ | |/ | |||||
| * | Move object delete commands into a commands region module, in preparation ↵ | Justin Clark-Casey (justincc) | 2012-01-31 | 1 | -0/+206 |
| | | | | | | | | for adding similar show commands. | ||||
| * | Make parcel sale overlays work. No auction support. | Melanie | 2012-01-31 | 1 | -4/+84 |
| | | |||||
| * | Use the requested sim's map, not our own | Melanie | 2012-01-30 | 1 | -2/+2 |
| | | |||||
* | | Draw brders around parcels for sale | Melanie | 2012-01-31 | 1 | -11/+37 |
| | | |||||
* | | Make parcel sale overlays work. No auction support. | Melanie | 2012-01-31 | 1 | -4/+84 |
| | | |||||
* | | Use the requested sim's map, not our own | Melanie | 2012-01-30 | 1 | -2/+2 |
| | | |||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-30 | 1 | -19/+29 |
|\ \ | |/ | |||||
| * | Patch in the rest of the maptile stuff | Melanie | 2012-01-30 | 1 | -3/+7 |
| | | |||||
| * | Next step for world map overlays | Melanie | 2012-01-30 | 1 | -2/+3 |
| | | |||||
| * | Some plumbing for map overlays | Melanie | 2012-01-30 | 1 | -15/+20 |
| | | |||||
| * | Pickup map overlay tile from RegionSettings.ParcelImageID | BlueWall | 2012-01-30 | 1 | -1/+1 |
| | | |||||
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-01-30 | 3 | -8/+17 |
|\ \ | | | | | | | | | | careminster | ||||
| * | | Add the ability to abort a pending restart using the viewer UI or a | Melanie | 2012-01-28 | 2 | -0/+9 |
| | | | | | | | | | | | | RemoteAdmin message | ||||
| * | | Fix calculating land prim count type width issue | Melanie | 2012-01-28 | 1 | -8/+8 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-01-29 | 2 | -4/+3 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Merge branch 'master' of /home/opensim/var/repo/opensim into mapwork | BlueWall | 2012-01-28 | 4 | -14/+89 |
| |\ | |||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-01-28 | 4 | -14/+89 |
| | |\ | |||||
| * | | | Adding our parcel's generated id to map packets | BlueWall | 2012-01-28 | 1 | -2/+2 |
| |/ / | |||||
| * | | Send CHANGED_TELEPORT during local TP again - partially revert ↵ | Bo Iwu | 2012-01-28 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | cf73afec356eed30e169be3ce71edad89b4fdb37 Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-01-28 | 4 | -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-28 | 4 | -14/+89 |
| |/ | | | | | | | same grid don't have the publisher as owner. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-28 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Remove IClientAPI from the money module. It was only used to pass in the | Melanie | 2012-01-28 | 1 | -1/+1 |
| | | | | | | | | agent id anyway | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-26 | 1 | -11/+13 |
|\ \ | |/ | |||||
| * | Change references from sop to sog and add protection from null ref | BlueWall | 2012-01-26 | 1 | -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 careminster | Melanie | 2012-01-26 | 2 | -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|--home | nebadon | 2012-01-25 | 1 | -2/+2 |
| | | | | | | | | | | switches which replace -p|--profile ie: "save oar --home=http://hg.osgrid.org:80 region.oar" | ||||
| * | llGetParcelMusicURL implementation ↵ | Pixel Tomsen | 2012-01-25 | 1 | -1/+10 |
| | | | | | | | | | | | | http://wiki.secondlife.com/wiki/LlGetParcelMusicURL Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-25 | 1 | -15/+66 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2012-01-25 | 1 | -2/+51 |
| |\ | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs | ||||
| | * | Telehub map items displayed | BlueWall | 2012-01-24 | 1 | -3/+51 |
| | | | |||||
| * | | Change the WorldMapModule to use SOG rather than SOP for the telehub ans | Melanie | 2012-01-25 | 1 | -13/+15 |
| |/ | | | | | | | cover a potential nullref | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-01-25 | 1 | -0/+18 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs | ||||
| * | Put Telehubs on the map | BlueWall | 2012-01-24 | 1 | -0/+18 |
| | | |||||
| * | Simplify and streamline telehub editing code. Verify rotations and fix | Melanie | 2012-01-24 | 2 | -58/+30 |
| | | | | | | | | spwan point positioning on rotated telehubs. | ||||
| * | Reverse the spawn point distance vector | Melanie | 2012-01-24 | 1 | -1/+1 |
| | | |||||
| * | Correct a coordinate to make the viewer like it | Melanie | 2012-01-24 | 1 | -1/+1 |
| | |