aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-05-243-4/+5
|\
| * 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 ↵Justin Clark-Casey (justincc)2010-05-241-2/+3
| | | | | | | | attachments
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2010-05-2312-7/+130
| |\
| | * Remove an unneeded conditionalMelanie2010-05-231-2/+1
| | |
| * | The 8th migration statement in AssetStore.migrations didn't look right.Diva Canto2010-05-231-1/+1
| | |
* | | Add the SitGround flag back inMelanie2010-05-231-1/+4
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-2312-3/+134
|\ \ \ | | |/ | |/| | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | Apply http://opensimulator.org/mantis/view.php?id=4632Justin Clark-Casey (justincc)2010-05-212-2/+60
| | | | | | | | | | | | | | | Adds dialog methods for MRM. Thanks ziah.
| * | Apply http://opensimulator.org/mantis/view.php?id=4627Justin Clark-Casey (justincc)2010-05-212-0/+20
| | | | | | | | | | | | Adds OwnerId and CreatorId properties to MRM.IObject
| * | Apply adaption of patch in http://opensimulator.org/mantis/view.php?id=4628Justin Clark-Casey (justincc)2010-05-211-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/opensimJustin Clark-Casey (justincc)2010-05-211-0/+57
| |\ \ | | |/
| * | Added overload of SendGenericMessage to LLClientView with string list as ↵Mikko Pallari2010-05-219-0/+47
| | | | | | | | | | | | 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-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 ↵Justin Clark-Casey (justincc)2010-05-211-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 ↵Melanie2010-05-211-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 Hurliman2010-05-211-1/+13
| | |/ | |/| | | | | | | update priority policy
| * | * Moving all of the prioritization/reprioritization code into a new file ↵John Hurliman2010-05-2115-315/+207
| |/ | | | | | | | | | | | | 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-211-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-211-0/+34
| | | | | | | | scene with that uuid fails
| * extend TestAddSceneObject() to check Scene.AddNewSceneObject() return booleanJustin Clark-Casey (justincc)2010-05-212-5/+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-212-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 methodJustin Clark-Casey (justincc)2010-05-215-38/+108
| | | | | | | | | | reused in both tests and oar code reduction in checking is outweighed by greater test clarity
| * 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
| | | | | | | | some older content
* | 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
| | | | | | | | * 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 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-21243-4893/+5995
|\ \ | |/
| * Cleaned up MySql migrations a bit more, got rid of all old-form migration ↵Diva Canto2010-05-205-32/+8
| | | | | | | | files. Restored Presence table to its taboo-breaking form.
| * Removed sessionID from GridUserservice again. Removed parcel crossing ↵Diva Canto2010-05-209-21/+18
| | | | | | | | detection from Robust connector. Fixed Simian to continue to send those location updates upon parcel crossing, without changing the interface.
| * Merging slimupdates2unknown2010-05-2032-889/+1093
| |\
| | * * Don't send texture data for prims in ImprovedTerseObjectUpdate packets ↵unknown2010-05-201-1/+5
| | | | | | | | | | | | unless we were asked to
| | * * Added sessionID to IGridUserService.SetLastPosition(), as some connectors ↵unknown2010-05-209-132/+189
| | | | | | | | | | | | | | | | | | 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 ↵unknown2010-05-153-50/+7
| | |\ | | | | | | | | | | | | slimupdates2
| | * | Refactor scene presence list for lockless iteration. Lock contention will ↵Dan Lake2010-05-151-61/+53
| | | | | | | | | | | | | | | | now only be for simultaneous add/removes of scene presences from the scene.
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into ↵unknown2010-05-131-8/+8
| | |\ \ | | | | | | | | | | | | | | | slimupdates2
| | * | | Implements three new OSSL functions for parcel management: osParcelJoin ↵OpenSim Master2010-05-138-0/+144
| | | | | | | | | | | | | | | | | | | | 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 ↵unknown2010-05-121-5/+4
| | | | | | | | | | | | | | | | | | | | working)
| | * | | * Initial commit of the slimupdates2 rewrite. This pass maintains the ↵unknown2010-05-1214-696/+704
| | | | | | | | | | | | | | | | | | | | original behavior of avatar update sending and has a simplified set of IClientAPI methods for sending avatar/prim updates
| * | | | Revert one of the previous patches' hunks. The new code looked better, butMelanie2010-05-201-3/+10
| | | | | | | | | | | | | | | | | | | | was less efficient.
| * | | | Series of patches to include creator ID in assets.AlexRa2010-05-201-4/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Contains a migration. SQLite: May contain nuts. The SQLite migration copies the entire asset table. Be prepared for quite a wait. Don't interrupt it. Back up your assets db. BasicAssetTest checks CreatorID storage, new test for weird CreatorID (now also checks that non-GUID or empty CreatorID gets stored correctly) Signed-off-by: Melanie <melanie@t-data.com>