aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-08-175-21/+176
|\
| * minor: remove mono compiler warnings from ScenePresenceJustin Clark-Casey (justincc)2013-08-171-4/+3
| * Add ScenePresenceTeleportTests.TestSameSimulatorIsolatedRegionsV2() regressio...Justin Clark-Casey (justincc)2013-08-173-5/+67
| * Add TestSameSimulatorNeighbouringRegionsV2() regression test for v2 entity tr...Justin Clark-Casey (justincc)2013-08-161-2/+87
| * Rely on the Scene.IncomingCloseAgent() check as to whether the connection sho...Justin Clark-Casey (justincc)2013-08-151-1/+1
| * Do not use the SP.DoNotCloseAfterTeleport flag for child agent connections.Justin Clark-Casey (justincc)2013-08-151-11/+20
* | Merge branch 'master' into careminsterMelanie2013-08-142-0/+25
|\ \ | |/
| * Add method doc to Scene.RemoveClient() to ask any callers to use Scene.Incomi...Justin Clark-Casey (justincc)2013-08-142-0/+25
* | Merge branch 'master' into careminsterMelanie2013-08-113-137/+368
|\ \ | |/
| * Increase wait for source region to sent UpdateAgent to 10 seconds instead of 4.Justin Clark-Casey (justincc)2013-08-091-1/+1
| * Add missing file from b1c26a56Justin Clark-Casey (justincc)2013-08-091-0/+102
| * Merge branch 'TeleportWork'Justin Clark-Casey (justincc)2013-08-092-115/+235
| |\
| | * Fix an issue with an A->C->B->A teleport where these regions are in a row (A,...Justin Clark-Casey (justincc)2013-08-091-0/+8
| | * Fix an issue where under teleport v2 protocol, teleporting from regions in an...Justin Clark-Casey (justincc)2013-08-082-116/+228
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-08-092-22/+35
| |\ \
| | * | Make m_originRegionID in ScenePresence public to allow DSG module to work for...Dan Lake2013-08-081-2/+2
| | |/
| * | Go easy on enforcing session ids in position updatesDiva Canto2013-08-091-16/+17
* | | Merge branch 'master' into careminsterMelanie2013-08-073-38/+63
|\ \ \ | | |/ | |/|
| * | minor: add some method doc to ScenePresence fields used for entity transfer, ...Justin Clark-Casey (justincc)2013-08-072-20/+33
| |/
| * Fixed incomplete commit r/23317 -- see_into_region. Put the guard around esta...Diva Canto2013-08-071-16/+16
| * Child agent updates: remove the dependency on the root agent's camera positio...Diva Canto2013-08-051-2/+1
| * More on HG inventory and OutboundPermission: disallowing giving inventory to ...Diva Canto2013-08-031-0/+3
| * HG: If OutboundPermission is set to false, let's enforce stricter permissions...Diva Canto2013-08-031-0/+3
| * 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-294-51/+66
|\ \ | |/
| * Fix failure in TestCreateDuplicateRootScenePresence().Justin Clark-Casey (justincc)2013-07-261-0/+13
| * Fix regression tests relating to agent transfer by making simulator use last ...Justin Clark-Casey (justincc)2013-07-261-0/+6
| * Fix NPC regression test failures.Justin Clark-Casey (justincc)2013-07-261-1/+3
| * Comment debug messageDiva Canto2013-07-261-2/+2
| * This should fix all issues with teleports. One should be able to TP as fast a...Diva Canto2013-07-251-32/+29
| * Reset DoNotClose scene presence teleport flag before pausing. Rename DoNotCl...Justin Clark-Casey (justincc)2013-07-262-2/+2
| * If a returning teleport starts to reuse a downgraded child connection that wa...Justin Clark-Casey (justincc)2013-07-262-11/+25
* | Merge branch 'master' into careminsterMelanie2013-07-252-58/+99
|\ \ | |/
| * Moved TriggerOnMakeRootAgent back to the end of MakeRootAgent, to see if that...Diva Canto2013-07-241-7/+2
| * Minor adjustment on timings of waits.Diva Canto2013-07-241-2/+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-242-6/+45
| * Further tweaks on TPs: not sending the callback URL and instead waiting 15sec...Diva Canto2013-07-241-1/+1
| * Amend previous commit.Diva Canto2013-07-241-4/+4
| * Added config var that we all thought was already there: see_into_region. (Not...Diva Canto2013-07-241-34/+45
* | Merge branch 'master' into careminsterMelanie2013-07-244-35/+125
|\ \ | |/
| * Restoring landing on prims, which had been affected by the edit beams commit.Diva Canto2013-07-231-0/+19
| * Don't post Link asset types back to the home gridDiva Canto2013-07-232-5/+5
| * 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
| * Filter certain viewer effects depending on distance between the avatar that i...Diva Canto2013-07-211-7/+25
| * 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' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-07-181-2/+5
|\ \