aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ | | | |/ | | |/|
| | * | Reinsert PhysicsActor variable back into SOP.SubscribeForCollisionEvents() in...Justin Clark-Casey (justincc)2013-07-131-8/+12
| | |/
| * | Moved SendInitialDataToMe to earlier in CompleteMovement. Moved TriggerOnMake...Diva Canto2013-07-131-5/+14
| |/
| * Centralize duplicated code in SceneObjectPart for subscribing toRobert Adams2013-07-111-54/+43
| * minor: remove some regression test logging switches accidentally left uncomme...Justin Clark-Casey (justincc)2013-07-111-1/+1
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-07-093-9/+4
| |\
| | * minor: remove mono compiler warnings related to keyframe codeJustin Clark-Casey (justincc)2013-07-082-8/+3
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-07-081-0/+4
| | |\
| | * | Add "show caps stats by user" and "show caps stats by cap" console commands t...Justin Clark-Casey (justincc)2013-07-081-1/+1
| * | | Put guards on a bunch of exception-inducing code, as seen in logs from load t...Diva Canto2013-07-093-2/+11
| | |/ | |/|
| * | Try to normalize the creatorData of scene object parts with the trailing '/'....Diva Canto2013-07-061-0/+4
| |/
| * refactor: Make stats and sim status simpler by extending BaseStreamHandler li...Justin Clark-Casey (justincc)2013-07-061-20/+6
| * Add very basic regression test TestChildAgentSingleRegionCapabilities() which...Justin Clark-Casey (justincc)2013-07-051-0/+88
| * Throttle the viewer's requests for region handles. Apparently Kokua is reques...Diva Canto2013-07-041-18/+0
* | Merge branch 'master' into careminsterMelanie2013-07-042-23/+1
|\ \ | |/
| * Debug the RegionHandle handler (same issue)Diva Canto2013-07-041-0/+1
| * change "debug packet" command to "debug lludp packet" to conform with other "...Justin Clark-Casey (justincc)2013-07-041-23/+0
* | Merge branch 'master' into careminsterMelanie2013-06-304-22/+66
|\ \ | |/
| * Add materials store null check into UuidGatherer code.Justin Clark-Casey (justincc)2013-06-281-0/+4
| * Reinsert code for gathering uuids reference by materials back directly into U...Justin Clark-Casey (justincc)2013-06-282-30/+99
| * refactor: Move code for gathering textures referenced by materials into Mater...Justin Clark-Casey (justincc)2013-06-272-67/+33
| * Make the concept of namespaces explicit in dynamic attributesJustin Clark-Casey (justincc)2013-06-272-9/+11
| * Improve situation where editing just the root prim of an attachment causes ot...Justin Clark-Casey (justincc)2013-06-251-1/+10
| * Tidy up SOG.UpdateRootPosition() to eliminate unnecessary copying of Vector3 ...Justin Clark-Casey (justincc)2013-06-251-10/+4
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-231-5/+5
| |\
| | * Fix other places when saving scripts or notecards in prim inventories where m...Justin Clark-Casey (justincc)2013-06-181-5/+5
* | | Merge branch 'master' into careminsterMelanie2013-06-231-2/+2
|\ \ \ | |/ /
| * | Fix prim locking to behave like SLMelanie2013-06-231-2/+2
| |/
* | Merge branch 'master' into careminsterMelanie2013-06-134-3/+14
|\ \ | |/
| * * This fixes having to select and deselect prim to get keyframemotion to star...teravus2013-06-121-0/+5