Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |||||
| * | Add a TeleportFlags member to SP so we can tell how we got there. | Melanie | 2011-01-27 | 2 | -0/+15 |
| | | |||||
| * | Also set Godlike flag. Might be useful | Melanie | 2011-01-27 | 1 | -0/+2 |
| | | |||||
| * | Add TeleportFlags.ViaRegionID to the flags sent on login when the region | Melanie | 2011-01-27 | 1 | -8/+13 |
| | | | | | | | | | | was entered by hand to determine whether or not to honor the landing point | ||||
* | | 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 |
| | | |||||
* | | Fix build break | Melanie | 2011-01-27 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-27 | 10 | -106/+178 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2011-01-26 | 5 | -19/+136 |
| |\ | |||||
| | * | Add some comments on ILandObject.StartPoint and EndPoint | Justin Clark-Casey (justincc) | 2011-01-26 | 1 | -0/+10 |
| | | | |||||
| | * | Implement command "land show". This shows all the parcels on the currently ↵ | Justin Clark-Casey (justincc) | 2011-01-26 | 5 | -19/+126 |
| | | | | | | | | | | | | | | | | | | selected region/s This is useful for diagnostics. The command is "land show" rather than "show land" because it's implemented as a module specific subcommand. | ||||
| * | | Remove the RestorePresences functions (which don't seem to be doing | Mic Bowman | 2011-01-26 | 2 | -69/+12 |
| |/ | | | | | | | | | anything) and clean up the code in AddNewClient (so Appearance only gets assigned once, not three times). | ||||
| * | Removed a few more spurious appearance saves. When an avatar | Mic Bowman | 2011-01-25 | 3 | -18/+31 |
| | | | | | | | | | | | | | | enters a region the attachments module tries to update the appearance with attachments that are already part of the appearance. Just added a check to only save if the attachments weren't there before. | ||||
| * | Fix script data not being reset as it should be | Melanie | 2011-01-24 | 1 | -0/+4 |
| | | |||||
* | | Add a TeleportFlags member to SP so we can tell how we got there. | Melanie | 2011-01-27 | 2 | -0/+14 |
| | | |||||
* | | Also set Godlike flag. Might be useful | Melanie | 2011-01-27 | 1 | -0/+2 |
| | | |||||
* | | Add TeleportFlags.ViaRegionID to the flags sent on login when the region | Melanie | 2011-01-27 | 1 | -8/+13 |
| | | | | | | | | | | was entered by hand to determine whether or not to honor the landing point | ||||
* | | Clear user account cache before checking flags on login. This will make AV | Melanie | 2011-01-27 | 1 | -0/+3 |
| | | | | | | | | and other bannable flags work in this case. | ||||
* | | Add an interface for a region's user account cache | Melanie | 2011-01-27 | 4 | -1/+16 |
| | | |||||
* | | Fix merge artifacts | Melanie | 2011-01-27 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2011-01-27 | 7 | -19/+93 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Mostly revert the last commit with the aim of searching for a better solution | Tom | 2011-01-26 | 7 | -35/+5 |
| | | | |||||
| * | | Add a "useCached" parameter to GetUserAccount. Add a function to Scene to ↵ | Tom | 2011-01-26 | 8 | -32/+55 |
| | | | | | | | | | | | | get the user flags. It has to be here due to access restrictions :/ | ||||
| * | | Add userFlags check to isBanned. This checks bans against DenyAnonymous and ↵ | Tom | 2011-01-26 | 5 | -10/+78 |
| | | | | | | | | | | | | DenyMinors. Note that the ban doesn't actually work yet due to some stuff mel's working on . | ||||
| * | | Revert my previous SHA1 commit in favour of a better implementation | Tom | 2011-01-26 | 2 | -6/+10 |
| | | | |||||
| * | | Provide an SL compatible llMD5String function across all platforms | Tom | 2011-01-26 | 2 | -5/+11 |
| | | | |||||
| * | | Make llSHA1Hash SL compatible when using characters like the euro symbol (€) | Tom | 2011-01-26 | 1 | -1/+3 |
| | | | |||||
* | | | Make bans work for teleport. Now teleport will complete block if the user | Melanie | 2011-01-27 | 4 | -57/+56 |
|/ / | | | | | | | | | | | | | is not allowed on the estate. If the user is allowed on no parcel, the teleport will also be blocked. If the user is allowed on a parcel, but not the desired one, the user will be shifted to the closest allowed location. | ||||
* | | Reproduce a corner case behavior for llListReplaceList | Melanie | 2011-01-25 | 1 | -6/+9 |
| | | |||||
* | | Complete country support | Melanie | 2011-01-24 | 1 | -0/+8 |
| | | |||||
* | | Fix script data not being reset as it should be | Melanie | 2011-01-24 | 1 | -0/+4 |
| | | |||||
* | | Add a careminster API to scripting again | Melanie | 2011-01-24 | 4 | -0/+32 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-23 | 31 | -383/+519 |
|\ \ | |/ | |||||
| * | Fixes mantis #5343 | Diva Canto | 2011-01-23 | 1 | -0/+1 |
| | | |||||
| * | stop extremely old region serialization commands from appearing in the console | Justin Clark-Casey (justincc) | 2011-01-22 | 1 | -27/+26 |
| | | | | | | | | as far as I know these are unused and unsupported. Please re-enable if this is not the case. This does not effect save-xml[2]/load-xml[2] |