Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-02-07 | 2 | -22/+24 | |
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiverModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Server/Handlers/Simulation/AgentHandlers.cs OpenSim/Services/Connectors/SimianGrid/SimianGridMaptileModule.cs OpenSim/Services/GridService/HypergridLinker.cs | |||||
| | * | Send object date to viewer in microseconds (Fixes mantis bug #3990) | Kevin Cozens | 2011-02-04 | 1 | -1/+2 | |
| | | | ||||||
| | * | Change UpdateAgent (for changes in agent position) to be sent | Mic Bowman | 2011-02-03 | 1 | -21/+22 | |
| | | | | | | | | | | | | | | | | | | once to each simulator rather than once to each region. This should help with some of the delays caused by multiple outstanding requests to a single service point. | |||||
| | * | 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 | 2 | -13/+42 | |
| | | | ||||||
| | * | 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 | |
| | | | ||||||
* | | | Merge branch 'careminster-presence-refactor' of ↵ | Kitto Flora | 2011-02-04 | 1 | -0/+2 | |
|\ \ \ | |/ / | | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor | |||||
| * | | Squash a nullref | Melanie | 2011-02-02 | 1 | -0/+2 | |
| | | | ||||||
* | | | Corrections for Avatar Auto-pilot target; add llStopMoveToTarget() for ↵ | Kitto Flora | 2011-02-04 | 2 | -5/+55 | |
|/ / | | | | | | | Avatar-attached. | |||||
* | | 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 | |
| | | ||||||
* | | Fix bumping into sim borders and check estate bans for walking crossings | Melanie | 2011-01-28 | 2 | -13/+42 | |
| | | ||||||
* | | 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 | 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. |