aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-05-2128-420/+544
|\
| * 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-2115-315/+207
| | |\ \
| | * | | 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-2115-315/+207
| |/
| * 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-212-5/+13
| * Fix a problem where SceneGraph.AddSceneObject() would return false on success...Justin Clark-Casey (justincc)2010-05-212-8/+14
| * make oar object filename/pathname creation a helper methodJustin Clark-Casey (justincc)2010-05-215-38/+108
| * minor: refactor CreateAsset to eliminate dupe codeJustin Clark-Casey (justincc)2010-05-211-3/+5
| * add prim item and test asset save in save oar unit testJustin Clark-Casey (justincc)2010-05-216-11/+55
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-211-9/+7
|\ \ | |/
| * Only send dialogs and notices to root agents, not child agentsJustin Clark-Casey (justincc)2010-05-211-9/+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-211-0/+0
|\ \ | |/
| * Replace CSJ2K with fixed version (Mantis #3318)Melanie2010-05-211-0/+0
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-211-38/+32
|\ \ | |/
| * * Made PriorityQueue non-generic so it natively understands EntityUpdate structsJohn Hurliman2010-05-201-38/+32
| * Ensure that the first update sent out for any given prim is a full updateMelanie Thielker2010-05-211-0/+11
* | Ensure that the first update sent out for any given prim is a full updateMelanie Thielker2010-05-211-0/+11
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-21245-4893/+5999
|\ \ | |/
| * Cleaned up MySql migrations a bit more, got rid of all old-form migration fil...Diva Canto2010-05-205-32/+8
| * Removed sessionID from GridUserservice again. Removed parcel crossing detecti...Diva Canto2010-05-209-21/+18
| * Merging slimupdates2unknown2010-05-2032-889/+1093
| |\
| | * * Don't send texture data for prims in ImprovedTerseObjectUpdate packets unle...unknown2010-05-201-1/+5
| | * * Added sessionID to IGridUserService.SetLastPosition(), as some connectors w...unknown2010-05-209-132/+189
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupd...unknown2010-05-154-50/+8
| | |\
| | * | Refactor scene presence list for lockless iteration. Lock contention will now...Dan Lake2010-05-151-61/+53
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupd...unknown2010-05-131-8/+8
| | |\ \
| | * | | Implements three new OSSL functions for parcel management: osParcelJoin joins...OpenSim Master2010-05-138-0/+144
| | * | | Minor tweak in ProcessEntityUpdates (mostly just confirming the git push is w...unknown2010-05-121-5/+4
| | * | | * Initial commit of the slimupdates2 rewrite. This pass maintains the origina...unknown2010-05-1214-696/+704
| * | | | Revert one of the previous patches' hunks. The new code looked better, butMelanie2010-05-201-3/+10
| * | | | Series of patches to include creator ID in assets.AlexRa2010-05-201-4/+35
| * | | | Scrambled asset type in BasicAssetTest.cs!AlexRa2010-05-191-9/+10
| * | | | MySQLAssetData.cs now supports asset_flags, CreatorIDAlexRa2010-05-191-5/+7
| * | | | MySQL: added CreatorID, moved asset_flag to migration scriptAlexRa2010-05-191-0/+8
| * | | | SQLite: CreatorID added (and asset_flags moved) to the migration scriptAlexRa2010-05-191-0/+24
| * | | | Added CreatorID to SQLite asset dataAlexRa2010-05-191-15/+27
| * | | | A bit of harmless refactoring in SQLiteAssetData.csAlexRa2010-05-191-10/+3
| * | | | Prebuild: added *.migrations as resources to MSSQL, SQLiteLegacy (just in case)AlexRa2010-05-191-0/+2
| * | | | Kind of fixed Melanie's "Exception(sql)" correctionAlexRa2010-05-191-2/+2
| * | | | Change appender to deal with line feeds more intelligently.Melanie2010-05-192-2/+5
| * | | | Clean up output a bitMelanie2010-05-193-9/+12
| * | | | Fix the migration message to say "Continuing" again. Remove line feed, whichMelanie2010-05-191-1/+1