aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Expand)AuthorAgeFilesLines
* Prevent a null refMelanie Thielker2010-05-271-0/+3
* Merge branch 'master' into careminster-presence-refactorMelanie2010-05-241-1/+1
|\
| * Change the way alpha is interpreted on prim text. Manris #4723Melanie2010-05-241-1/+1
| * Remove an unneeded conditionalMelanie2010-05-231-2/+1
* | Add the SitGround flag back inMelanie2010-05-231-1/+4
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-231-1/+7
|\ \ | |/
| * Apply adaption of patch in http://opensimulator.org/mantis/view.php?id=4628Justin Clark-Casey (justincc)2010-05-211-3/+2
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-219-321/+349
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-05-212-69/+68
| |\
| | * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-05-212-17/+32
| | |\
| | | * Added a sanity check before using m_config in the Scene constructorJohn Hurliman2010-05-211-16/+19
| | * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-05-215-267/+173
| | |\ \
| | * | | rearrange SceneGraph.AddSceneObject() to return earlier if an object with tha...Justin Clark-Casey (justincc)2010-05-211-53/+49
| * | | | Add a new priority scheme that works like FrontBack, but completely depriorit...Melanie2010-05-211-0/+57
| | |_|/ | |/| |
| * | | * Added code comments to Prioritizer.cs that document how to add a new update...John Hurliman2010-05-211-1/+13
| | |/ | |/|
| * | * Moving all of the prioritization/reprioritization code into a new file Prio...John Hurliman2010-05-215-267/+173
| |/
| * minor: remove LongRunning test designator from TestAddSceneObject() since it ...Justin Clark-Casey (justincc)2010-05-211-1/+1
| * add test to make sure that adding an object where one already exists in the s...Justin Clark-Casey (justincc)2010-05-211-0/+34
| * extend TestAddSceneObject() to check Scene.AddNewSceneObject() return booleanJustin Clark-Casey (justincc)2010-05-211-3/+13
| * Fix a problem where SceneGraph.AddSceneObject() would return false on success...Justin Clark-Casey (justincc)2010-05-211-7/+14
| * add prim item and test asset save in save oar unit testJustin Clark-Casey (justincc)2010-05-212-4/+7
| * Change the way the object perms are propagated to attempt to salvageMelanie2010-05-211-21/+23
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-212-27/+38
|\ \ | |/
| * Merging slimupdates2unknown2010-05-203-88/+91
| |\
| | * Refactor scene presence list for lockless iteration. Lock contention will now...Dan Lake2010-05-151-61/+53
| | * * Initial commit of the slimupdates2 rewrite. This pass maintains the origina...unknown2010-05-122-27/+38
* | | Refactor scene presence list for lockless iteration. Lock contention will now...Melanie2010-05-211-82/+49
* | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-05-212-22/+54
|\ \ \
| * | | Change the way the object perms are propagated to attempt to salvageMelanie2010-05-211-21/+23
| * | | Fix a nullref issue in SitAltitudeCallbackTom Grimshaw2010-05-191-50/+53
* | | | Initialise m_initialSitTarget to ZERO_VACTOR for safety's sake as per convo w...Tom Grimshaw2010-05-191-1/+1
* | | | Fix a nullref issue in SitAltitudeCallbackTom Grimshaw2010-05-191-6/+9
* | | | Don't send kill packets to child agents as we close themTom Grimshaw2010-05-181-2/+2
* | | | Fix to the scenario where we send an agent to a neighbouring sim (via telepor...Tom Grimshaw2010-05-182-6/+19
* | | | Fix for hanging on "Connecting to region".. caused by packets being processed...Tom Grimshaw2010-05-181-49/+53
* | | | When killing a zombie session, don't send the stop packet since it often has ...Tom Grimshaw2010-05-171-1/+1
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-161-23/+14
|\ \ \ \ | | |/ / | |/| |
| * | | Fixes mantis #4622.Diva Canto2010-05-161-23/+14
* | | | Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/va...Melanie2010-05-163-11/+61
|\ \ \ \
| * | | | Kill some locks that have crept into SOGTom Grimshaw2010-05-121-2/+12
| * | | | Optimise the heavily used GetScenePresences; eliminate the array->list conver...Tom Grimshaw2010-05-121-8/+48
| * | | | Fix another ReaderWriterLockSlim issueTom Grimshaw2010-05-101-1/+1
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-163-24/+77
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Finalized the client's TCP IP address verification process for HG1.5.Diva Canto2010-05-153-24/+77
| | |/ | |/|
* | | Fix overlooked readLock which was left openTom Grimshaw2010-05-101-1/+2
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-101-2/+4
|\ \ \ | |/ /
| * | * Fixed spamming the assets table with map tiles. The tile image ID is now st...Diva Canto2010-05-091-2/+4
* | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-05-083-19/+19
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-05-073-36/+81
| |\ \
| | * | Fix linking issue introduced in my earlier commitMelanie Thielker2010-04-301-1/+19