| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into careminster-presence-refactor | Melanie | 2011-01-27 | 1 | -67/+10 |
| |\ | |||||
| | * | Remove the RestorePresences functions (which don't seem to be doing | Mic Bowman | 2011-01-26 | 1 | -67/+10 |
| | | | | | | | | | | | anything) and clean up the code in AddNewClient (so Appearance only gets assigned once, not three times). | ||||
| | * | HG bug fix. Must wait for client's UDP contact before getting scene presence. | Diva Canto | 2011-01-06 | 1 | -4/+11 |
| | | | |||||
| * | | Add a TeleportFlags member to SP so we can tell how we got there. | Melanie | 2011-01-27 | 1 | -0/+4 |
| | | | |||||
| * | | 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 | 1 | -4/+38 |
| |\ \ | | | | | | | | | | 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 | 1 | -4/+39 |
| | | | | | | | | | | | | | 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. | ||||
| * | | Temporarily reinstate prim counting in the update loop to make the production | Melanie | 2011-01-14 | 1 | -7/+7 |
| | | | | | | | | | systems run | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-30 | 1 | -2/+2 |
| |\ \ | |/ | |||||
| | * | Bug fix in neighbors: serverURI now always has a trailing '/'... neighbors ↵ | Diva Canto | 2010-12-29 | 1 | -2/+2 |
| | | | | | | | | | were not getting notified. | ||||
| * | | Copying a ref type under lock doesn't dissociate it from the source. | Melanie | 2010-12-29 | 1 | -2/+2 |
| | | | | | | | | | Use a new list to do that. | ||||
| * | | Prevent a null ref when an avatar login doesn't go as planned | Melanie | 2010-12-22 | 1 | -1/+2 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-20 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Put the coarse location updates back to 50 frames, otherwise the dots on the ↵ | Diva Canto | 2010-12-19 | 1 | -1/+1 |
| | | | | | | | | | mini-map come and go noticeably. Also increased the Velocity a bit; I had decreased it to 0.885; now it's 0.9. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-17 | 1 | -4/+4 |
| |\ \ | |/ | |||||
| | * | remove mono compiler warnings | Justin Clark-Casey (justincc) | 2010-12-17 | 1 | -4/+4 |
| | | | |||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-15 | 1 | -15/+18 |
| |\ \ | |/ | |||||
| | * | Yet more things out of the main Update thread loop and into threadlets. This ↵ | Diva Canto | 2010-12-14 | 1 | -8/+7 |
| | | | | | | | | | time, SendPrimsUpdate. Plus a few more tweaks on triggering actions from the Update loop. #LoginLag. | ||||
| | * | Another attempt at moving heavy computation away from the Update loop. #LoginLag | Diva Canto | 2010-12-14 | 1 | -2/+6 |
| | | | |||||
| | * | Commented out the UpdateLand call from the Update thread loop, because this ↵ | Diva Canto | 2010-12-14 | 1 | -6/+6 |
| | | | | | | | | | may be causing the #LoginLag. Attachments taint the prim count. Twice. Each. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-09 | 1 | -1/+1 |
| |\ \ | |/ | |||||
| | * | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 1 | -0/+11 |
| | | | | | | | | | whether or not an agent is allowed there as a root agent. | ||||
| | * | change doc. trivial commit to get panda to rebuild | Justin Clark-Casey (justincc) | 2010-12-08 | 1 | -1/+1 |
| | | | |||||
| * | | Plumb a code path for the entity transfer module to ask a destination scene | Melanie | 2010-12-09 | 1 | -0/+11 |
| | | | | | | | | | whether or not an agent is allowed there as a root agent. | ||||
| * | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-06 | 1 | -0/+1 |
| |\ \ | |/ | |||||
| | * | Fixed some inconsistency with trailing /. Made debug messages consistent. ↵ | Diva Canto | 2010-12-05 | 1 | -3/+2 |
| | | | | | | | | | Changed the stored region names of HG regions. Increased the size of regionName in DB. | ||||
| | * | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-12-05 | 1 | -68/+16 |
| | |\ | |||||
| | * \ | Merge branch 'master-core' into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -33/+7 |
| | |\ \ | |||||
| | * \ \ | Merge https://github.com/opensim/opensim into mantis5110 | Jonathan Freedman | 2010-11-21 | 1 | -2/+47 |
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -0/+7 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| | * \ \ \ \ | Merge branch 'master' into mantis5110 | Jonathan Freedman | 2010-10-29 | 1 | -16/+27 |
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | | | | | | | Revert "Revert "Trigger changed event with CHANGED_TELEPORT when teleporting ↵ | Melanie | 2010-12-03 | 1 | -9/+6 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to another region."" This reverts commit 6c01ebb87541ecf66d678606bb97d996bee51953. | ||||
| * | | | | | | | Improve health reporting | Melanie | 2010-12-03 | 1 | -10/+18 |
| | | | | | | | | |||||
| * | | | | | | | Fix health reporting. This will now actually monitor the threads properly | Melanie | 2010-12-03 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and not just the http server. It will also restart a dead heartbeat. | ||||
| * | | | | | | | Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to ↵ | Melanie | 2010-12-03 | 1 | -6/+9 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | another region." This reverts commit 2827deffe822378b6cb35dac6c90a21c3fbc0de7. Pulling out a bad core commit that broke attachment teleporting for us | ||||
| * | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-12-03 | 1 | -4/+8 |
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | Also prevent god takes from ending up in Lost and Found | ||||
| | * | | | | | | Only force prim persistence before delete if the prim is the result of an ↵ | Justin Clark-Casey (justincc) | 2010-12-03 | 1 | -4/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | unpersisted delink This considerably improves delete performance for objects with large linksets | ||||
| | * | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-29 | 1 | -9/+6 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2010-11-25 | 1 | -55/+2 |
| | |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ↵ | Diva Canto | 2010-11-25 | 1 | -0/+1 |
| | | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | capability to preserve creator information on HG asset transfers. Added a new HGAssetService that is intended to be the one outside the firewall. It processes and filters the assets that go out of the grid. Also fixed the normal AssetService to do special things for the main instance (console commands, etc). Moved HGInventoryService to OpenSim.Services.HypergridService. Changed the way the login service gets the ServiceURL configs. | ||||
| * | | | | | | | | Change the way sim health reporting reports sim startup | Melanie | 2010-12-03 | 1 | -6/+14 |
| | | | | | | | | | |||||
| * | | | | | | | | Implement health monitoring of the packet receiving and sending threads | Melanie | 2010-11-28 | 1 | -3/+36 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-27 | 1 | -9/+6 |
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | | Trigger changed event with CHANGED_TELEPORT when teleporting to another region. | Marck | 2010-11-26 | 1 | -9/+6 |
| | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-11-25 | 1 | -67/+2 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Change all restarting to use the restart module. Remove hardcoded behavior | Melanie | 2010-11-25 | 1 | -55/+2 |
| | |/ / / / / | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |