aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-08-011-0/+48
|\
| * Experimental comment to eneralize the handling of Linden caps when theMic Bowman2013-07-311-0/+48
* | Merge branch 'master' into careminsterMelanie2013-07-296-52/+69
|\ \ | |/
| * Added BasicSearchModule.cs which handles OnDirFindQuery events. Removed that ...Diva Canto2013-07-281-0/+2
| * Several major improvements to group (V2) chat. Specifically: handle join/drop...Diva Canto2013-07-271-1/+1
| * 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' into careminsterMelanie2013-07-241-0/+19
|\ \ | |/
| * Improvements to the ServiceThrottleModule: added a category and an itemid to ...Diva Canto2013-07-161-1/+9
| * Added IServiceThrottleModule.csDiva Canto2013-07-161-0/+11
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-07-181-2/+5
|\ \
| * \ Merge branch 'master' into careminsterMelanie2013-07-131-8/+12
| |\ \
| * \ \ Merge branch 'master' into careminsterMelanie2013-07-137-73/+159
| |\ \ \
* | \ \ \ Merge branch 'master' into careminsterMelanie2013-07-1810-85/+194
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Let's go easy on authenticating ChildAgentUpdates, otherwise this will be cha...Diva Canto2013-07-141-7/+5
| * | | Fix broken tests -- the test setup was wrong... sigh.Diva Canto2013-07-141-0/+1
| * | | Authenticate ChildAgentUpdate too.Diva Canto2013-07-142-16/+29
| * | | Change the auth token to be the user's sessionid.Diva Canto2013-07-142-3/+3
| * | | And this fixes the other failing tests. Justin, the thread pool is not being ...Diva Canto2013-07-131-2/+0
| * | | This should fix the failing test.Diva Canto2013-07-131-2/+1
| * | | Deleted a line too manyDiva Canto2013-07-131-0/+3
| * | | Guard against unauthorized agent deletes.Diva Canto2013-07-133-10/+30
| * | | 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
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-131-8/+12
| |\ \ \ | | | |/ | | |/|