aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/ScenePresence.cs (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-10-041-15/+48
|\
| * minor: Add scene name to baked textures in cache log messageJustin Clark-Casey (justincc)2013-09-261-1/+1
| * Lock around read/write of ScenePresence.m_originRegionID to make sure that al...Justin Clark-Casey (justincc)2013-09-201-5/+33
| * minor: Make SP.MakeRootAgent() private - no external code has any business ca...Justin Clark-Casey (justincc)2013-09-191-1/+1
| * minor: Make log message at top of ScenePresence.CompleteMovement info level a...Justin Clark-Casey (justincc)2013-09-191-5/+5
| * minor: correct method name in commentJustin Clark-Casey (justincc)2013-09-181-1/+1
| * refactor: rename *ChildAgentDataUpdate() methods to *UpdateChildAgent()Justin Clark-Casey (justincc)2013-09-181-2/+3
| * minor: Make log message when Scene.IncomingChildAgentDateUpdate() more explic...Justin Clark-Casey (justincc)2013-09-181-1/+4
* | Merge branch 'avination-current' into careminsterMelanie2013-09-161-4/+5
|\ \
| * | Mono 2.0 fix - call ToArray() explicitlyMelanie2013-09-081-4/+5
* | | Merge branch 'master' into careminsterMelanie2013-09-011-5/+6
|\ \ \ | | |/ | |/|
| * | Remove old and unused ScenePresence.RestoreInCurrentScene()Justin Clark-Casey (justincc)2013-08-231-5/+0
| * | Don't allow users to attempt to sit on objects in a child region without goin...Justin Clark-Casey (justincc)2013-08-211-0/+9
* | | Merge branch 'master' into careminsterMelanie2013-08-171-4/+3
|\ \ \ | |/ /
| * | minor: remove mono compiler warnings from ScenePresenceJustin Clark-Casey (justincc)2013-08-171-4/+3
* | | Merge branch 'master' into careminsterMelanie2013-08-111-7/+34
|\ \ \ | |/ /
| * | Increase wait for source region to sent UpdateAgent to 10 seconds instead of 4.Justin Clark-Casey (justincc)2013-08-091-1/+1
| * | Merge branch 'TeleportWork'Justin Clark-Casey (justincc)2013-08-091-4/+32
| |\ \
| | * | Fix an issue where under teleport v2 protocol, teleporting from regions in an...Justin Clark-Casey (justincc)2013-08-081-4/+32
| * | | Make m_originRegionID in ScenePresence public to allow DSG module to work for...Dan Lake2013-08-081-2/+2
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-08-071-12/+24
|\ \ \ | |/ /
| * | minor: add some method doc to ScenePresence fields used for entity transfer, ...Justin Clark-Casey (justincc)2013-08-071-10/+17
| * | Child agent updates: remove the dependency on the root agent's camera positio...Diva Canto2013-08-051-2/+1
| * | Turn off edit beams when object is derezed while being edited. (mantis #6722)Diva Canto2013-08-011-0/+6
* | | Merge branch 'master' into careminsterMelanie2013-07-291-1/+10
|\ \ \ | |/ /
| * | Fix NPC regression test failures.Justin Clark-Casey (justincc)2013-07-261-1/+3
| * | Reset DoNotClose scene presence teleport flag before pausing. Rename DoNotCl...Justin Clark-Casey (justincc)2013-07-261-1/+1
| * | If a returning teleport starts to reuse a downgraded child connection that wa...Justin Clark-Casey (justincc)2013-07-261-0/+7
* | | Merge branch 'master' into careminsterMelanie2013-07-251-9/+34
|\ \ \ | |/ /
| * | Moved TriggerOnMakeRootAgent back to the end of MakeRootAgent, to see if that...Diva Canto2013-07-241-7/+2
| * | This commit message intentionally left blank (last commit was idiotic)Diva Canto2013-07-241-1/+2
| * | Improve the opening test in CompleteMovement, to account for multiple flags b...Diva Canto2013-07-241-1/+1
| * | New Teleport protocol (V2), still compatible with V1 and older. (version of t...Diva Canto2013-07-241-2/+31
* | | Merge branch 'master' into careminsterMelanie2013-07-241-24/+96
|\ \ \ | |/ /
| * | Restoring landing on prims, which had been affected by the edit beams commit.Diva Canto2013-07-231-0/+19
| * | Minor aesthetic change to make things more clear.Diva Canto2013-07-211-1/+2
| * | EDIT BEAMS!!! They had been missing from OpenSim since ever. Thanks to lkalif...Diva Canto2013-07-211-1/+4
| * | A couple of small optimizations over the previous commitDiva Canto2013-07-211-1/+1
| * | Manage AgentUpdates more sanely:Diva Canto2013-07-211-40/+70
* | | Merge branch 'master' into careminsterMelanie2013-07-181-10/+23
|\ \ \ | |/ /
| * | Authenticate ChildAgentUpdate too.Diva Canto2013-07-141-1/+2
| * | Change the auth token to be the user's sessionid.Diva Canto2013-07-141-1/+1
| * | And this fixes the other failing tests. Justin, the thread pool is not being ...Diva Canto2013-07-131-2/+0
| * | Guard against unauthorized agent deletes.Diva Canto2013-07-131-1/+5
| * | Some more debug to see how many threads are available.Diva Canto2013-07-131-0/+2
| * | That didn't fix the problem.Diva Canto2013-07-131-26/+34
| * | Trying to reduce CPU usage on logins and TPs: trying radical elimination of a...Diva Canto2013-07-131-34/+26
| * | This commit effectively reverses the previous one, but it's just to log that ...Diva Canto2013-07-131-4/+4
| * | Same issue as previous commit.Diva Canto2013-07-131-3/+4
| * | Moved SendInitialDataToMe to earlier in CompleteMovement. Moved TriggerOnMake...Diva Canto2013-07-131-5/+14