aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2011-05-051-6/+35
|\
| * Put the previous state back in the attachments in case the agent transfer fails.Diva Canto2011-05-041-1/+14
| * use getters instead of member variables in velocity network filter code and a...dahlia2011-05-041-6/+8
| * adjust terse avatar update filtering to send updates when distance traveled d...dahlia2011-05-031-3/+17
* | Some private changes to the prioritizer: 30m steps instead of 10 and disableMelanie2011-05-031-2/+2
* | Revert the CM prioritizer to the core versionMelanie2011-05-031-8/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-05-031-1/+1
|\ \ | |/
| * Check for RegionID instead of RegionHandle. Other minor tweaksDiva Canto2011-04-301-1/+1
| * When coming in from a legacy region without fatpacks, start scripts theMelanie2011-04-301-0/+16
* | When coming in from a legacy region without fatpacks, start scripts theMelanie2011-04-301-0/+16
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2011-04-305-155/+164
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorMelanie2011-04-305-133/+119
| |\ \ | | |/
| | * Delaying starting the scripts on TPs and crossings until the agent is root.Diva Canto2011-04-292-23/+40
| | * Remove the scripts of the attachments in the departing region and recreate th...Diva Canto2011-04-291-0/+2
| | * Minor correction to yesterday's changes. Make normal prim crossing (no attach...Diva Canto2011-04-292-2/+3
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2011-04-282-2/+9
| | |\
| | | * Stop CHANGED_INVENTORY firing twice if a notecard is edited in prim.Justin Clark-Casey (justincc)2011-04-282-2/+9
| | * | Fatpack message on agent transfers: 1 message only (UpdateAgent) containing t...Diva Canto2011-04-283-98/+32
| | |/
| | * Fix a bug where physical objects rezzed with an initial velocity by script do...Justin Clark-Casey (justincc)2011-04-281-0/+6
| | * network traffic reduction - decrease update frequency for moving avatars when...dahlia2011-04-261-10/+24
| | * Add back the high prioritization for other avatars in theMic Bowman2011-04-261-6/+8
| * | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2011-04-261-0/+4
| |\ \
| * \ \ Merge branch 'queuetest' into careminster-presence-refactorMelanie2011-04-252-22/+45
| |\ \ \ | | | |/ | | |/|
| | * | Fixed the transmission of throttles from root agent to childMic Bowman2011-04-251-18/+15
| | * | Merge branch 'master' into queuetestMic Bowman2011-04-255-28/+83
| | |\ \
| | * | | Added a second immediate queue to be used for the BestAvatar policyMic Bowman2011-04-221-4/+30
* | | | | Set the attachment data on scripted rez to allow toasters to work.Melanie2011-04-301-0/+3
| |_|_|/ |/| | |
* | | | Try to repair attachments ion the fly if they are detached and reattached.Melanie2011-04-261-0/+4
|/ / /
* | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-213-28/+58
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-04-213-28/+58
| |\ \
| | * | minor: small amount of method doc and some commented out odds and endsJustin Clark-Casey (justincc)2011-04-211-6/+15
| | * | Alter uuid gather so that it properly analyzes coalesced objects.Justin Clark-Casey (justincc)2011-04-212-22/+43
| * | | Implement agent limitsMelanie2011-04-212-0/+25
| |/ /
* | | Add fix a minor bugMelanie2011-04-211-1/+1
* | | Honor agent limit for region crossings and teleportsMelanie2011-04-211-0/+11
* | | Merge branch 'queuetest' into careminster-presence-refactorMelanie2011-04-211-2/+2
|\ \ \ | | |/ | |/|
| * | Added an "immediate" queue to the priority queue. This isMic Bowman2011-04-201-2/+2
| |/
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-212-2/+19
|\ \ | |/
| * refactor: rename DeleteToInventory() to CopyToInventory()Justin Clark-Casey (justincc)2011-04-182-2/+19
* | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-182-13/+7
|\ \ | |/
| * Merge branch 'master' into test-merge0418Mic Bowman2011-04-185-18/+62
| |\
| * \ Merge branch 'master' into queuetestMic Bowman2011-04-141-1/+5
| |\ \
| * | | First pass at moving object property requests into a queue similarMic Bowman2011-04-132-13/+7
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2011-04-1711-30/+426
|\ \ \ \ | | |_|/ | |/| |
| * | | get rid of all traces of the now used mock service infrastructureJustin Clark-Casey (justincc)2011-04-152-4/+4
| * | | remove mock asset service for tests in favour of always using the real oneJustin Clark-Casey (justincc)2011-04-151-1/+3
| * | | Make all the objects in a coalescence reappears after being loaded from an IA...Justin Clark-Casey (justincc)2011-04-151-6/+41
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-04-141-1/+5
| |\ \ \ | | | |/ | | |/|
| | * | Comment out the warning if the prioritizer runs without a fullyMic Bowman2011-04-131-1/+5
| | |/
| * | simplify coalesced object tests by using existing scene object set up utilsJustin Clark-Casey (justincc)2011-04-141-7/+14
| |/