aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-05-242-3/+4
|\
| * Change the way alpha is interpreted on prim text. Manris #4723Melanie2010-05-241-1/+1
| * minor: expand upon comments about not scheduling two full updates for attachm...Justin Clark-Casey (justincc)2010-05-241-2/+3
| * 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-237-3/+116
|\ \ | |/
| * Apply http://opensimulator.org/mantis/view.php?id=4632Justin Clark-Casey (justincc)2010-05-212-2/+60
| * Apply http://opensimulator.org/mantis/view.php?id=4627Justin Clark-Casey (justincc)2010-05-212-0/+20
| * Apply adaption of patch in http://opensimulator.org/mantis/view.php?id=4628Justin Clark-Casey (justincc)2010-05-211-3/+2
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-05-211-0/+57
| |\
| * | Added overload of SendGenericMessage to LLClientView with string list as para...Mikko Pallari2010-05-214-0/+29
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-2118-395/+475
|\ \ \ | | |/ | |/|
| * | 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-219-299/+193
| | |\ \
| | * | | 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-219-299/+193
| |/
| * 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-212-8/+14
| * make oar object filename/pathname creation a helper methodJustin Clark-Casey (justincc)2010-05-214-38/+75
| * add prim item and test asset save in save oar unit testJustin Clark-Casey (justincc)2010-05-214-7/+38
* | 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-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-2115-419/+504
|\ \ | |/
| * Removed sessionID from GridUserservice again. Removed parcel crossing detecti...Diva Canto2010-05-203-13/+5
| * Merging slimupdates2unknown2010-05-2018-479/+562
| |\
| | * * 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-203-6/+6
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into slimupd...unknown2010-05-152-2/+7
| | |\
| | * | Refactor scene presence list for lockless iteration. Lock contention will now...Dan Lake2010-05-151-61/+53
| | * | Implements three new OSSL functions for parcel management: osParcelJoin joins...OpenSim Master2010-05-137-0/+140
| | * | 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-127-412/+360
* | | | 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
|\ \ \ \
| * \ \ \ Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-05-215-443/+542
| |\ \ \ \
| | * | | | back port groups changesunknown2010-05-052-1329/+73
| | * | | | back port groups changesunknown2010-05-055-443/+1798
| | * | | | Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector for...Melanie2010-05-054-1570/+320
| | * | | | Patch from mcortez: Update groups, add ALPHA Siman grid connector for groupsMelanie2010-05-054-320/+1570