Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-29 | 1 | -0/+55 |
|\ | |||||
| * | Create the structure of classes and interfaces to replace the cruft that | Melanie | 2011-01-29 | 1 | -0/+2 |
| | | | | | | | | is in the land management module today | ||||
| * | Add the prim count interfaces | Melanie | 2011-01-28 | 1 | -0/+53 |
| | | |||||
| * | Fix up QueryAccess to also check parcels | Melanie | 2011-01-28 | 1 | -1/+1 |
| | | |||||
| * | Fix bumping into sim borders and check estate bans for walking crossings | Melanie | 2011-01-28 | 3 | -14/+43 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2011-01-28 | 1 | -1/+1 |
|\ \ | | | | | | | | | | 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 work | Melanie | 2011-01-28 | 1 | -1/+1 |
|/ / | |||||
* | | Fix up QueryAccess to also check parcels | Melanie | 2011-01-28 | 1 | -7/+22 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2011-01-28 | 3 | -14/+43 |
|\ \ | | | | | | | | | | 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 | 3 | -14/+43 |
| | | | |||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-28 | 1 | -0/+1 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Thank you, Goetz, for a patch to fix prim count display in cut regions. | Melanie | 2011-01-28 | 1 | -0/+1 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-27 | 1 | -0/+8 |
|\ \ | |/ | |||||
| * | When an oar is loaded, do not create a default parcel before loading the ↵ | Justin Clark-Casey (justincc) | 2011-01-27 | 1 | -1/+4 |
| | | | | | | | | | | | | | | | | 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). | ||||
| * | Fix OAR parcel loading so that old parcels are replaced by the new instead ↵ | Justin Clark-Casey (justincc) | 2011-01-27 | 1 | -0/+5 |
| | | | | | | | | | | | | of merged. The --merge switch will still merge the old and new land parcelling. | ||||
| * | 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 |
| | | |||||
* | | 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 | 1 | -5/+26 |
| | | | | | | | | | | 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 | 3 | -69/+26 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Mic Bowman | 2011-01-26 | 1 | -0/+14 |
| |\ | |||||
| | * | 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 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | 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). | ||||
| * | 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 |
| | | |||||
* | | 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 | 1 | -0/+13 |
| | | |||||
* | | Fix merge artifacts | Melanie | 2011-01-27 | 1 | -3/+3 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2011-01-27 | 2 | -4/+46 |
|\ \ | | | | | | | | | | 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 | 1 | -1/+1 |
| | | | |||||
| * | | Add a "useCached" parameter to GetUserAccount. Add a function to Scene to ↵ | Tom | 2011-01-26 | 1 | -22/+20 |
| | | | | | | | | | | | | 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 | 2 | -4/+47 |
| | | | | | | | | | | | | DenyMinors. Note that the ban doesn't actually work yet due to some stuff mel's working on . | ||||
* | | | Make bans work for teleport. Now teleport will complete block if the user | Melanie | 2011-01-27 | 1 | -51/+48 |
|/ / | | | | | | | | | | | | | 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. | ||||
* | | Fix script data not being reset as it should be | Melanie | 2011-01-24 | 1 | -0/+4 |
| | | |||||
* | | Completely nixing flags from the client causes wearables to break. Fix it | Melanie | 2011-01-22 | 1 | -0/+1 |
| | | | | | | | | so we let the lowest byte through. | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-18 | 1 | -12/+4 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2011-01-17 | 2 | -5/+5 |
| |\ | |||||
| | * | minor: resolve some mono compiler warnings | Justin Clark-Casey (justincc) | 2011-01-18 | 2 | -2/+2 |
| | | | |||||
| | * | Prune some of the excess logging for client logins. | Justin Clark-Casey (justincc) | 2011-01-18 | 1 | -3/+3 |
| | | | | | | | | | | | | Didn't touch the appearance related stuff. | ||||
| * | | Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, ↵ | Diva Canto | 2011-01-17 | 1 | -8/+0 |
| |/ | | | | | | | because Reset hangs for a long time waiting for the lock. That is a problem in itself -- that long holding of the lock by some thread -- but let's just avoid it altogether. | ||||
| * | Revert "DEBUG DEBUG DEBUG" | Diva Canto | 2011-01-17 | 1 | -4/+0 |
| | | | | | | | | This reverts commit 59c2cd04ba056b85eb4873e472b95826a1cc13b5. | ||||
| * | DEBUG DEBUG DEBUG | Diva Canto | 2011-01-17 | 1 | -0/+4 |
| | | |||||
| * | Fix slam bits being lost when editing perms in prim inventory | Melanie | 2011-01-14 | 1 | -1/+0 |
| | |