Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-29 | 12 | -64/+723 |
|\ | |||||
| * | Flash out the prim count module | Melanie | 2011-01-29 | 1 | -0/+174 |
| | | |||||
| * | Create the structure of classes and interfaces to replace the cruft that | Melanie | 2011-01-29 | 2 | -0/+122 |
| | | | | | | | | is in the land management module today | ||||
| * | Adding the prim count module skeleton | Melanie | 2011-01-28 | 2 | -0/+113 |
| | | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-01-28 | 9 | -64/+261 |
| |\ | |||||
| | * | Comment out unused call to GridService in TeleportAgent() | Justin Clark-Casey (justincc) | 2011-01-28 | 1 | -1/+1 |
| | | | |||||
| | * | minor: don't bother reparsing the sources for includes if ReadConfig() was ↵ | Justin Clark-Casey (justincc) | 2011-01-28 | 1 | -2/+3 |
| | | | | | | | | | | | | unsuccessful | ||||
| | * | If a non-globbed included file from config cannot be found then warn the user | Justin Clark-Casey (justincc) | 2011-01-28 | 1 | -3/+13 |
| | | | |||||
| | * | Add groups cache timeout setting for Flotsam Groups back to OpenSimDefaults.ini | Justin Clark-Casey (justincc) | 2011-01-28 | 1 | -0/+5 |
| | | | |||||
| | * | minor: remove a few mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-28 | 3 | -7/+8 |
| | | | |||||
| | * | Display supported file extensions/formats in "terrain load help" (Mantis #5349) | Kevin Cozens | 2011-01-28 | 1 | -2/+8 |
| | | | |||||
| | * | Added loading and saving of terrain files using Terragen format (Mantis #1564) | Kevin Cozens | 2011-01-28 | 2 | -50/+224 |
| | | | | | | | | | | | | | | | | | | | | | Terrain files can now be loaded and saved using the Terragen (.ter) format. Selection of the terrain file loader to use is now based on the extension of the filename being loaded and the data is loaded using a memory stream instead of writing it to a file and then loading it from the file. | ||||
| * | | Add the prim count interfaces | Melanie | 2011-01-28 | 1 | -0/+53 |
| |/ | |||||
| * | Make the new style stuff compatible with the older revision | Melanie | 2011-01-28 | 1 | -1/+14 |
| | | |||||
* | | Significantly increase the total number of URL's available. In second life, ↵ | Tom | 2011-01-28 | 1 | -1/+1 |
| | | | | | | | | the limit is 15,000 URL's (one per prim), so i'd hope we can manage 1k. | ||||
* | | Fix a discrepancy vs. SL with parsing x-query-string | Tom | 2011-01-28 | 1 | -1/+8 |
| | | |||||
* | | Make llRequestAgentData shout an error instead of crashing the script when ↵ | Tom | 2011-01-28 | 1 | -78/+86 |
| | | | | | | | | an invalid UUID is passed to it. | ||||
* | | Make the new style stuff compatible with the older revision | Melanie | 2011-01-28 | 1 | -1/+14 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2011-01-28 | 1 | -1/+1 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * \ | Merge branch 'careminster-presence-refactor' of ↵ | Kitto Flora | 2011-01-28 | 0 | -0/+0 |
| |\ \ | | | | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | | Correct chat source location for Av seated on daughter prim. | Kitto Flora | 2011-01-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | Change the way ban lines are handled. Remove a lot of useless stuff designed | Melanie | 2011-01-28 | 1 | -53/+10 |
| | | | | | | | | | | | | | | | | | | | | to physically move the avatar and instead just re-set the position. Ban lines now work fully. | ||||
* | | | | Change the way ban lines work | Melanie | 2011-01-28 | 2 | -5/+13 |
| |/ / |/| | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-28 | 0 | -0/+0 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Fix up QueryAccess to also check parcels | Melanie | 2011-01-28 | 7 | -16/+31 |
| | | |||||
* | | Fix up QueryAccess to also check parcels | Melanie | 2011-01-28 | 7 | -19/+46 |
| | | |||||
* | | Comment a very spammy debug message that was being output directly to console. | Melanie | 2011-01-28 | 1 | -1/+1 |
| | | | | | | | | | | My last fox that makes bumping into sim borders/bans work makes this spam endlessly. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-28 | 0 | -0/+0 |
|\ \ | |/ | |||||
| * | Fix bumping into sim borders and check estate bans for walking crossings | Melanie | 2011-01-28 | 4 | -32/+112 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2011-01-28 | 4 | -32/+112 |
|\ \ | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Fix bumping into sim borders and check estate bans for walking crossings | Melanie | 2011-01-28 | 4 | -32/+112 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-28 | 6 | -39/+85 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2011-01-28 | 2 | -30/+58 |
| |\ | |||||
| | * | Refactor: Break out LoadObjects() and LoadParcels() from a longer method | Justin Clark-Casey (justincc) | 2011-01-27 | 1 | -28/+44 |
| | | | |||||
| | * | Put confirmation on "land clear" command to avoid nasty accidents | Justin Clark-Casey (justincc) | 2011-01-27 | 1 | -2/+14 |
| | | | |||||
| * | | Thank you, Goetz, for a patch to fix prim count display in cut regions. | Melanie | 2011-01-28 | 5 | -10/+28 |
| |/ | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-27 | 6 | -21/+83 |
|\ \ | |/ | |||||
| * | When an oar is loaded, do not create a default parcel before loading the ↵ | Justin Clark-Casey (justincc) | 2011-01-27 | 6 | -15/+25 |
| | | | | | | | | | | | | | | | | parcels from the OAR. The region spanning parcel shouldn't exist in this situation. If it does, when the land data is loaded it is repersisted with a local ID which comes after the ones loaded via the oar, which obliterates the oar loaded one. Resaving the data we just loaded from the database is somewhat odd in itself (though this makes sense from the way that OAR loading was already using the same event). | ||||
| * | Show local IDs in "land show" output. | Justin Clark-Casey (justincc) | 2011-01-27 | 2 | -5/+11 |
| | | | | | | | | Also properly insert region name in "land clear" command | ||||
| * | Add "land clear" command | Justin Clark-Casey (justincc) | 2011-01-27 | 1 | -3/+13 |
| | | | | | | | | This clears all parcels from the currently selected region and replaces them with the single region spanning default parcel owned by the estate owner | ||||
| * | Fix OAR parcel loading so that old parcels are replaced by the new instead ↵ | Justin Clark-Casey (justincc) | 2011-01-27 | 6 | -0/+44 |
| | | | | | | | | | | | | of merged. The --merge switch will still merge the old and new land parcelling. | ||||
| * | remove unused CreateBaseLand() | Justin Clark-Casey (justincc) | 2011-01-27 | 1 | -9/+0 |
| | | |||||
| * | Make it work | Melanie | 2011-01-27 | 1 | -4/+6 |
| | | |||||
* | | Make the estate setting "Allow direct teleport" override the constraint | Melanie | 2011-01-27 | 1 | -0/+3 |
| | | | | | | | | of local tepeports to landing points like it is meant to | ||||
* | | Let gods TP in wherever they like while in god mode | Melanie | 2011-01-27 | 1 | -0/+1 |
| | | |||||
* | | Implement "Cannot teleport closer to destination" message | Melanie | 2011-01-27 | 1 | -1/+5 |
| | | |||||
* | | Make landing points work on local teleports. Constrain owners and gods to | Melanie | 2011-01-27 | 2 | -5/+27 |
| | | | | | | | | | | landing points when coming from off sim (matches agni) to prevent landing in floors or other prims. | ||||
* | | Change the way landing points are honored | Melanie | 2011-01-27 | 1 | -6/+13 |
| | | |||||
* | | Make it work | Melanie | 2011-01-27 | 1 | -4/+6 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-27 | 0 | -0/+0 |
|\ \ | |/ |