aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/Scene.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-01-271-67/+10
|\
| * Remove the RestorePresences functions (which don't seem to be doingMic Bowman2011-01-261-67/+10
| * HG bug fix. Must wait for client's UDP contact before getting scene presence.Diva Canto2011-01-061-4/+11
* | Add a TeleportFlags member to SP so we can tell how we got there.Melanie2011-01-271-0/+4
* | Clear user account cache before checking flags on login. This will make AVMelanie2011-01-271-0/+3
* | Fix merge artifactsMelanie2011-01-271-3/+3
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2011-01-271-4/+38
|\ \
| * | 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 get...Tom2011-01-261-22/+20
| * | Add userFlags check to isBanned. This checks bans against DenyAnonymous and D...Tom2011-01-261-4/+39
* | | Make bans work for teleport. Now teleport will complete block if the userMelanie2011-01-271-51/+48
|/ /
* | Temporarily reinstate prim counting in the update loop to make the productionMelanie2011-01-141-7/+7
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-301-2/+2
|\ \ | |/
| * Bug fix in neighbors: serverURI now always has a trailing '/'... neighbors we...Diva Canto2010-12-291-2/+2
* | Copying a ref type under lock doesn't dissociate it from the source.Melanie2010-12-291-2/+2
* | Prevent a null ref when an avatar login doesn't go as plannedMelanie2010-12-221-1/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-201-1/+1
|\ \ | |/
| * Put the coarse location updates back to 50 frames, otherwise the dots on the ...Diva Canto2010-12-191-1/+1
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-171-4/+4
|\ \ | |/
| * remove mono compiler warningsJustin Clark-Casey (justincc)2010-12-171-4/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-151-15/+18
|\ \ | |/
| * Yet more things out of the main Update thread loop and into threadlets. This ...Diva Canto2010-12-141-8/+7
| * Another attempt at moving heavy computation away from the Update loop. #LoginLagDiva Canto2010-12-141-2/+6
| * Commented out the UpdateLand call from the Update thread loop, because this m...Diva Canto2010-12-141-6/+6
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-091-1/+1
|\ \ | |/
| * Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-091-0/+11
| * change doc. trivial commit to get panda to rebuildJustin Clark-Casey (justincc)2010-12-081-1/+1
* | Plumb a code path for the entity transfer module to ask a destination sceneMelanie2010-12-091-0/+11
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-061-0/+1
|\ \ | |/
| * Fixed some inconsistency with trailing /. Made debug messages consistent. Cha...Diva Canto2010-12-051-3/+2
| * Merge branch 'master-core' into mantis5110Jonathan Freedman2010-12-051-68/+16
| |\
| * \ Merge branch 'master-core' into mantis5110Jonathan Freedman2010-11-211-33/+7
| |\ \
| * \ \ Merge https://github.com/opensim/opensim into mantis5110Jonathan Freedman2010-11-211-2/+47
| |\ \ \
| * \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-0/+7
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into mantis5110Jonathan Freedman2010-10-291-16/+27
| |\ \ \ \ \
* | | | | | | Revert "Revert "Trigger changed event with CHANGED_TELEPORT when teleporting ...Melanie2010-12-031-9/+6
* | | | | | | Improve health reportingMelanie2010-12-031-10/+18
* | | | | | | Fix health reporting. This will now actually monitor the threads properlyMelanie2010-12-031-3/+3
* | | | | | | Revert "Trigger changed event with CHANGED_TELEPORT when teleporting to anoth...Melanie2010-12-031-6/+9
* | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-12-031-4/+8
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Only force prim persistence before delete if the prim is the result of an unp...Justin Clark-Casey (justincc)2010-12-031-4/+7
| * | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-291-9/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2010-11-251-55/+2
| |\ \ \ \ \ \ \
| * | | | | | | | WARNING: LOTS OF CONFIGURATION CHANGES AFFECTING PRIMARILY HG CONFIGS. Added ...Diva Canto2010-11-251-0/+1
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Change the way sim health reporting reports sim startupMelanie2010-12-031-6/+14
* | | | | | | | Implement health monitoring of the packet receiving and sending threadsMelanie2010-11-281-3/+36
* | | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-271-9/+6
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | Trigger changed event with CHANGED_TELEPORT when teleporting to another region.Marck2010-11-261-9/+6
| | |/ / / / / | |/| | | | |
* | | | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-251-67/+2
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Change all restarting to use the restart module. Remove hardcoded behaviorMelanie2010-11-251-55/+2
| |/ / / / /