Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-24 | 2 | -3/+4 |
|\ | |||||
| * | Change the way alpha is interpreted on prim text. Manris #4723 | Melanie | 2010-05-24 | 1 | -1/+1 |
| | | |||||
| * | minor: expand upon comments about not scheduling two full updates for ↵ | Justin Clark-Casey (justincc) | 2010-05-24 | 1 | -2/+3 |
| | | | | | | | | attachments | ||||
| * | Remove an unneeded conditional | Melanie | 2010-05-23 | 1 | -2/+1 |
| | | |||||
* | | Add the SitGround flag back in | Melanie | 2010-05-23 | 1 | -1/+4 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-23 | 7 | -3/+116 |
|\ \ | |/ | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs | ||||
| * | Apply http://opensimulator.org/mantis/view.php?id=4632 | Justin Clark-Casey (justincc) | 2010-05-21 | 2 | -2/+60 |
| | | | | | | | | | | Adds dialog methods for MRM. Thanks ziah. | ||||
| * | Apply http://opensimulator.org/mantis/view.php?id=4627 | Justin Clark-Casey (justincc) | 2010-05-21 | 2 | -0/+20 |
| | | | | | | | | Adds OwnerId and CreatorId properties to MRM.IObject | ||||
| * | Apply adaption of patch in http://opensimulator.org/mantis/view.php?id=4628 | Justin Clark-Casey (justincc) | 2010-05-21 | 1 | -3/+2 |
| | | | | | | | | | | This prevents a ground-sitting avatar from being moved about in mouselook Thanks mirceakitsune! | ||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-05-21 | 1 | -0/+57 |
| |\ | |||||
| * | | Added overload of SendGenericMessage to LLClientView with string list as ↵ | Mikko Pallari | 2010-05-21 | 4 | -0/+29 |
| | | | | | | | | | | | | parameter. Now modules themselfs don't necessarily need to convert strings to byte arrays. Added this as it was removed in LightShare patch. | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-21 | 18 | -395/+475 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-05-21 | 2 | -69/+68 |
| |\ \ | | |/ | |||||
| | * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-05-21 | 2 | -17/+32 |
| | |\ | |||||
| | | * | Added a sanity check before using m_config in the Scene constructor | John Hurliman | 2010-05-21 | 1 | -16/+19 |
| | | | | |||||
| | * | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-05-21 | 9 | -299/+193 |
| | |\ \ | |||||
| | * | | | rearrange SceneGraph.AddSceneObject() to return earlier if an object with ↵ | Justin Clark-Casey (justincc) | 2010-05-21 | 1 | -53/+49 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | that uuid is already in the scene this means that we don't perform pointless work | ||||
| * | | | | Add a new priority scheme that works like FrontBack, but completely ↵ | Melanie | 2010-05-21 | 1 | -0/+57 |
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | deprioritizes static prims, creating a hierarchy as follows: 0 == own avatar < other avatars < pysical prims < static prims For a child agent, simply acts like FrontBack | ||||
| * | | | * Added code comments to Prioritizer.cs that document how to add a new ↵ | John Hurliman | 2010-05-21 | 1 | -1/+13 |
| | |/ | |/| | | | | | | | update priority policy | ||||
| * | | * Moving all of the prioritization/reprioritization code into a new file ↵ | John Hurliman | 2010-05-21 | 9 | -299/+193 |
| |/ | | | | | | | | | | | | | Prioritizer.cs * Simplified the interest management code to make it easier to add new policies. Prioritization and reprioritization share code paths now * Improved the distance and front back policies to always give your avatar the highest priority | ||||
| * | minor: remove LongRunning test designator from TestAddSceneObject() since it ↵ | Justin Clark-Casey (justincc) | 2010-05-21 | 1 | -1/+1 |
| | | | | | | | | isn't, really | ||||
| * | add test to make sure that adding an object where one already exists in the ↵ | Justin Clark-Casey (justincc) | 2010-05-21 | 1 | -0/+34 |
| | | | | | | | | scene with that uuid fails | ||||
| * | extend TestAddSceneObject() to check Scene.AddNewSceneObject() return boolean | Justin Clark-Casey (justincc) | 2010-05-21 | 1 | -3/+13 |
| | | | | | | | | improve test to retrieve object by known uuid rather than dynamically assigned local id | ||||
| * | Fix a problem where SceneGraph.AddSceneObject() would return false on ↵ | Justin Clark-Casey (justincc) | 2010-05-21 | 2 | -8/+14 |
| | | | | | | | | | | | | successfully adding an object rather than true, in defiance of its method documentation This meant that the returns were inconsistent - false would be returned both for various scene object failure conditions (e.g. root part was null) and if the object was successfully added. | ||||
| * | make oar object filename/pathname creation a helper method | Justin Clark-Casey (justincc) | 2010-05-21 | 4 | -38/+75 |
| | | | | | | | | | | reused in both tests and oar code reduction in checking is outweighed by greater test clarity | ||||
| * | add prim item and test asset save in save oar unit test | Justin Clark-Casey (justincc) | 2010-05-21 | 4 | -7/+38 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-21 | 1 | -9/+7 |
|\ \ | |/ | |||||
| * | Only send dialogs and notices to root agents, not child agents | Justin Clark-Casey (justincc) | 2010-05-21 | 1 | -9/+7 |
| | | |||||
| * | Change the way the object perms are propagated to attempt to salvage | Melanie | 2010-05-21 | 1 | -21/+23 |
| | | | | | | | | some older content | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-21 | 1 | -38/+32 |
|\ \ | |/ | |||||
| * | * Made PriorityQueue non-generic so it natively understands EntityUpdate structs | John Hurliman | 2010-05-20 | 1 | -38/+32 |
| | | | | | | | | * Replaced the per-avatar seen update tracking with update flag combining, to avoid overwriting full updates with terse updates | ||||
| * | Ensure that the first update sent out for any given prim is a full update | Melanie Thielker | 2010-05-21 | 1 | -0/+11 |
| | | |||||
* | | Ensure that the first update sent out for any given prim is a full update | Melanie Thielker | 2010-05-21 | 1 | -0/+11 |
| | | |||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-21 | 15 | -419/+504 |
|\ \ | |/ | |||||
| * | Removed sessionID from GridUserservice again. Removed parcel crossing ↵ | Diva Canto | 2010-05-20 | 3 | -13/+5 |
| | | | | | | | | detection from Robust connector. Fixed Simian to continue to send those location updates upon parcel crossing, without changing the interface. | ||||
| * | Merging slimupdates2 | unknown | 2010-05-20 | 18 | -479/+562 |
| |\ | |||||
| | * | * Don't send texture data for prims in ImprovedTerseObjectUpdate packets ↵ | unknown | 2010-05-20 | 1 | -1/+5 |
| | | | | | | | | | | | | unless we were asked to | ||||
| | * | * Added sessionID to IGridUserService.SetLastPosition(), as some connectors ↵ | unknown | 2010-05-20 | 3 | -6/+6 |
| | | | | | | | | | | | | | | | | | | will want to track position against sessionID instead of userID * Updated SimianPresenceServiceConnector to use the new LoggedOut/SetHome/etc methods and only update session position on parcel crossing | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵ | unknown | 2010-05-15 | 2 | -2/+7 |
| | |\ | | | | | | | | | | | | | slimupdates2 | ||||
| | * | | Refactor scene presence list for lockless iteration. Lock contention will ↵ | Dan Lake | 2010-05-15 | 1 | -61/+53 |
| | | | | | | | | | | | | | | | | now only be for simultaneous add/removes of scene presences from the scene. | ||||
| | * | | Implements three new OSSL functions for parcel management: osParcelJoin ↵ | OpenSim Master | 2010-05-13 | 7 | -0/+140 |
| | | | | | | | | | | | | | | | | joins parcels in an area, osParcelSubdivide splits parcels in an area, osParcelSetDetails sets parcel name, description, owner and group owner. Join and Subdivide methods in LandChannel are exposed. | ||||
| | * | | Minor tweak in ProcessEntityUpdates (mostly just confirming the git push is ↵ | unknown | 2010-05-12 | 1 | -5/+4 |
| | | | | | | | | | | | | | | | | working) | ||||
| | * | | * Initial commit of the slimupdates2 rewrite. This pass maintains the ↵ | unknown | 2010-05-12 | 7 | -412/+360 |
| | | | | | | | | | | | | | | | | original behavior of avatar update sending and has a simplified set of IClientAPI methods for sending avatar/prim updates | ||||
* | | | | Refactor scene presence list for lockless iteration. Lock contention will ↵ | Melanie | 2010-05-21 | 1 | -82/+49 |
| | | | | | | | | | | | | | | | | now only be for simultaneous add/removes of scene presences from the scene. | ||||
* | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-05-21 | 2 | -22/+54 |
|\ \ \ \ | |||||
| * \ \ \ | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-05-21 | 5 | -443/+542 |
| |\ \ \ \ | |||||
| | * | | | | back port groups changes | unknown | 2010-05-05 | 2 | -1329/+73 |
| | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | * | | | | back port groups changes | unknown | 2010-05-05 | 5 | -443/+1798 |
| | | | | | | |||||
| | * | | | | Revert "Patch from mcortez: Update groups, add ALPHA Siman grid connector ↵ | Melanie | 2010-05-05 | 4 | -1570/+320 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | for groups" The patch was for 0.7 This reverts commit 608bb0dfefbbc97aded6d1357dd9d350053411fb. | ||||
| | * | | | | Patch from mcortez: Update groups, add ALPHA Siman grid connector for groups | Melanie | 2010-05-05 | 4 | -320/+1570 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mantis #4646 Signed-off-by: Melanie <melanie@t-data.com> |