aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-01-272-69/+12
|\
| * Remove the RestorePresences functions (which don't seem to be doingMic Bowman2011-01-262-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 beMelanie2011-01-241-0/+4
| |
* | Add a TeleportFlags member to SP so we can tell how we got there.Melanie2011-01-272-0/+14
| |
* | Clear user account cache before checking flags on login. This will make AVMelanie2011-01-271-0/+3
| | | | | | | | and other bannable flags work in this case.
* | Fix merge artifactsMelanie2011-01-271-3/+3
| |
* | Merge branch 'careminster-presence-refactor' of ↵Melanie2011-01-272-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 solutionTom2011-01-261-1/+1
| | |
| * | Add a "useCached" parameter to GetUserAccount. Add a function to Scene to ↵Tom2011-01-261-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 ↵Tom2011-01-262-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 userMelanie2011-01-271-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 beMelanie2011-01-241-0/+4
| |
* | Completely nixing flags from the client causes wearables to break. Fix itMelanie2011-01-221-0/+1
| | | | | | | | so we let the lowest byte through.
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-181-12/+4
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-01-172-5/+5
| |\
| | * minor: resolve some mono compiler warningsJustin Clark-Casey (justincc)2011-01-182-2/+2
| | |
| | * Prune some of the excess logging for client logins.Justin Clark-Casey (justincc)2011-01-181-3/+3
| | | | | | | | | | | | Didn't touch the appearance related stuff.
| * | Removed the call to sceneViewer.Reset upon MakeRoot and ChildAgentUpdate, ↵Diva Canto2011-01-171-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 Canto2011-01-171-4/+0
| | | | | | | | This reverts commit 59c2cd04ba056b85eb4873e472b95826a1cc13b5.
| * DEBUG DEBUG DEBUGDiva Canto2011-01-171-0/+4
| |
| * Fix slam bits being lost when editing perms in prim inventoryMelanie2011-01-141-1/+0
| |
| * Dont' trust the viewer! Fix a permission slam error caused by trustingMelanie2011-01-121-1/+0
| | | | | | | | the viewer too much.
| * Fix direct item give permissionsMelanie2011-01-123-12/+56
| |
| * Partial permissions fix for boxed items.Melanie2011-01-122-0/+17
| |
| * Fix god mode perms adjustmentMelanie2011-01-121-0/+2
| |
| * Fixes the issue of hung archives. Problem was with SceneObjectSerializer.Diva Canto2011-01-081-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 Canto2011-01-071-0/+4
| | | | | | | | forever.
| * A bit more frugal on the caller side of closing agents, now that the ↵Diva Canto2011-01-071-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 Canto2011-01-061-4/+11
| |
* | Add a new ViewObjectInventory permission to decouple viewing fromMelanie2011-01-141-0/+17
| | | | | | | | +MOD status
* | Temporarily reinstate prim counting in the update loop to make the productionMelanie2011-01-141-7/+7
| | | | | | | | systems run
* | Fix slam bits being lost when editing perms in prim inventoryMelanie2011-01-141-1/+0
| |
* | Merge branch 'careminster-presence-refactor' of ↵Kitto Flora2011-01-133-12/+55
|\ \ | | | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | Dont' trust the viewer! Fix a permission slam error caused by trustingMelanie2011-01-121-1/+0
| | | | | | | | | | | | the viewer too much.
| * | Fix direct item give permissionsMelanie2011-01-123-12/+56
| | |
* | | Add llLookAt() kinetic. Reduce StandUp +x offset to 0.3M.Kitto Flora2011-01-131-1/+1
|/ /
* | Partial permissions fix for boxed items.Melanie2011-01-102-10/+18
| |
* | Taint SOGs the right wayMelanie2011-01-101-1/+5
| |
* | Preserve the script running flag when copying an object.Melanie2011-01-081-0/+34
| |
* | Fix a couple of security issuesMelanie2011-01-082-3/+12
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-01-061-1/+2
|\ \ | |/
| * Note to self: try to make only 3 things at the same time.Diva Canto2011-01-041-1/+1
| |
| * Guard against null Animator.Diva Canto2011-01-041-1/+2
| |
| * Add permissions hooks for object transfersMelanie2011-01-031-4/+57
| |
| * Fix child agent scopingMelanie2011-01-031-4/+4
| |
* | Fix god mode perms adjustmentMelanie2011-01-061-0/+2
| |
* | Revise Materials properties; Fix Double-Click Autopilot; Allow non-script ↵Kitto Flora2011-01-041-2/+2
| | | | | | | | sit positions >= 0.1M; Add llLookAt(); Comment out spammy bad adjacent sim message.
* | Add permissions hooks for object transfersMelanie2011-01-031-4/+57
| |
* | Fix child agent scopingMelanie2010-12-311-4/+4
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-301-1/+1
|\ \ | |/