Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-27 | 2 | -69/+12 |
|\ | |||||
| * | 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. | ||||
* | | 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 |
| | | |||||
| * | Dont' trust the viewer! Fix a permission slam error caused by trusting | Melanie | 2011-01-12 | 1 | -1/+0 |
| | | | | | | | | the viewer too much. | ||||
| * | Fix direct item give permissions | Melanie | 2011-01-12 | 3 | -12/+56 |
| | | |||||
| * | Partial permissions fix for boxed items. | Melanie | 2011-01-12 | 2 | -0/+17 |
| | | |||||
| * | Fix god mode perms adjustment | Melanie | 2011-01-12 | 1 | -0/+2 |
| | | |||||
| * | Fixes the issue of hung archives. Problem was with SceneObjectSerializer. | Diva Canto | 2011-01-08 | 1 | -0/+12 |
| | | | | | | | | Also fixes a buglet in scene load xml command, where it was given the wrong argument index for filename. | ||||
| * | Try to fix a IAR problem reported by nebadon, where save iar seems stuck ↵ | Diva Canto | 2011-01-07 | 1 | -0/+4 |
| | | | | | | | | forever. | ||||
| * | A bit more frugal on the caller side of closing agents, now that the ↵ | Diva Canto | 2011-01-07 | 1 | -16/+20 |
| | | | | | | | | receiving end is async. No need for so much concurrency. | ||||
| * | HG bug fix. Must wait for client's UDP contact before getting scene presence. | Diva Canto | 2011-01-06 | 1 | -4/+11 |
| | | |||||
* | | Add a new ViewObjectInventory permission to decouple viewing from | Melanie | 2011-01-14 | 1 | -0/+17 |
| | | | | | | | | +MOD status | ||||
* | | Temporarily reinstate prim counting in the update loop to make the production | Melanie | 2011-01-14 | 1 | -7/+7 |
| | | | | | | | | systems run | ||||
* | | Fix slam bits being lost when editing perms in prim inventory | Melanie | 2011-01-14 | 1 | -1/+0 |
| | | |||||
* | | Merge branch 'careminster-presence-refactor' of ↵ | Kitto Flora | 2011-01-13 | 3 | -12/+55 |
|\ \ | | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | Dont' trust the viewer! Fix a permission slam error caused by trusting | Melanie | 2011-01-12 | 1 | -1/+0 |
| | | | | | | | | | | | | the viewer too much. | ||||
| * | | Fix direct item give permissions | Melanie | 2011-01-12 | 3 | -12/+56 |
| | | | |||||
* | | | Add llLookAt() kinetic. Reduce StandUp +x offset to 0.3M. | Kitto Flora | 2011-01-13 | 1 | -1/+1 |
|/ / | |||||
* | | Partial permissions fix for boxed items. | Melanie | 2011-01-10 | 2 | -10/+18 |
| | | |||||
* | | Taint SOGs the right way | Melanie | 2011-01-10 | 1 | -1/+5 |
| | | |||||
* | | Preserve the script running flag when copying an object. | Melanie | 2011-01-08 | 1 | -0/+34 |
| | | |||||
* | | Fix a couple of security issues | Melanie | 2011-01-08 | 2 | -3/+12 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-06 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Note to self: try to make only 3 things at the same time. | Diva Canto | 2011-01-04 | 1 | -1/+1 |
| | | |||||
| * | Guard against null Animator. | Diva Canto | 2011-01-04 | 1 | -1/+2 |
| | | |||||
| * | Add permissions hooks for object transfers | Melanie | 2011-01-03 | 1 | -4/+57 |
| | | |||||
| * | Fix child agent scoping | Melanie | 2011-01-03 | 1 | -4/+4 |
| | | |||||
* | | Fix god mode perms adjustment | Melanie | 2011-01-06 | 1 | -0/+2 |
| | | |||||
* | | Revise Materials properties; Fix Double-Click Autopilot; Allow non-script ↵ | Kitto Flora | 2011-01-04 | 1 | -2/+2 |
| | | | | | | | | sit positions >= 0.1M; Add llLookAt(); Comment out spammy bad adjacent sim message. | ||||
* | | Add permissions hooks for object transfers | Melanie | 2011-01-03 | 1 | -4/+57 |
| | | |||||
* | | Fix child agent scoping | Melanie | 2010-12-31 | 1 | -4/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-30 | 1 | -1/+1 |
|\ \ | |/ |