Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-21 | 9 | -321/+349 |
|\ | |||||
| * | 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 | 5 | -267/+173 |
| | |\ \ | |||||
| | * | | | 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 | 5 | -267/+173 |
| |/ | | | | | | | | | | | | | 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 | 1 | -7/+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. | ||||
| * | add prim item and test asset save in save oar unit test | Justin Clark-Casey (justincc) | 2010-05-21 | 2 | -4/+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 | 3 | -27/+41 |
|\ \ | |/ | |||||
| * | Merging slimupdates2 | unknown | 2010-05-20 | 4 | -88/+94 |
| |\ | |||||
| | * | 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 | 1 | -0/+3 |
| | | | | | | | | | | | | 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. | ||||
| | * | * Initial commit of the slimupdates2 rewrite. This pass maintains the ↵ | unknown | 2010-05-12 | 2 | -27/+38 |
| | | | | | | | | | | | | 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 | 1 | -0/+73 |
| |\ \ \ | |||||
| | * | | | back port groups changes | unknown | 2010-05-05 | 1 | -0/+73 |
| | | | | | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
| | * | | | Fix linking issue introduced in my earlier commit | Melanie Thielker | 2010-04-30 | 1 | -1/+19 |
| | | | | | |||||
| * | | | | Change the way the object perms are propagated to attempt to salvage | Melanie | 2010-05-21 | 1 | -21/+23 |
| | | | | | | | | | | | | | | | | | | | | some older content | ||||
| * | | | | Fix a nullref issue in SitAltitudeCallback | Tom Grimshaw | 2010-05-19 | 1 | -50/+53 |
| | | | | | |||||
* | | | | | Initialise m_initialSitTarget to ZERO_VACTOR for safety's sake as per convo ↵ | Tom Grimshaw | 2010-05-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | with kitto | ||||
* | | | | | Fix a nullref issue in SitAltitudeCallback | Tom Grimshaw | 2010-05-19 | 1 | -6/+9 |
| | | | | | |||||
* | | | | | Don't send kill packets to child agents as we close them | Tom Grimshaw | 2010-05-18 | 1 | -2/+2 |
| | | | | | |||||
* | | | | | Fix to the scenario where we send an agent to a neighbouring sim (via ↵ | Tom Grimshaw | 2010-05-18 | 3 | -6/+27 |
| | | | | | | | | | | | | | | | | | | | | teleport), then tell our neighbours to close the agents.. thereby disconnecting the user. Added a new CloseChildAgent method in lieu of CloseAgent. This has been a long standing problem - with any luck this will cure it. | ||||
* | | | | | Fix for hanging on "Connecting to region".. caused by packets being ↵ | Tom Grimshaw | 2010-05-18 | 1 | -49/+53 |
| | | | | | | | | | | | | | | | | | | | | processed before the presence has bound to receive events. Fixed this by adding packets to a queue and then processing them when the presence is ready. | ||||
* | | | | | When killing a zombie session, don't send the stop packet since it often has ↵ | Tom Grimshaw | 2010-05-17 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | the effect of killing a newly connected client. | ||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-16 | 1 | -23/+14 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Fixes mantis #4622. | Diva Canto | 2010-05-16 | 1 | -23/+14 |
| | | | | | |||||
* | | | | | Merge branch 'careminster-presence-refactor' of ↵ | Melanie | 2010-05-16 | 3 | -11/+61 |
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor | ||||
| * | | | | | Kill some locks that have crept into SOG | Tom Grimshaw | 2010-05-12 | 1 | -2/+12 |
| | | | | | | |||||
| * | | | | | Optimise the heavily used GetScenePresences; eliminate the array->list ↵ | Tom Grimshaw | 2010-05-12 | 1 | -8/+48 |
| | | | | | | | | | | | | | | | | | | | | | | | | conversion on every call and transition from hard locks to ReaderWriter locks. | ||||
| * | | | | | Fix another ReaderWriterLockSlim issue | Tom Grimshaw | 2010-05-10 | 1 | -1/+1 |
| | | | | | | |||||
* | | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-16 | 3 | -24/+77 |
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | |||||
| * | | | | Finalized the client's TCP IP address verification process for HG1.5. | Diva Canto | 2010-05-15 | 3 | -24/+77 |
| | |_|/ | |/| | | |||||
* | | | | Fix overlooked readLock which was left open | Tom Grimshaw | 2010-05-10 | 1 | -1/+2 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-10 | 2 | -3/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | * Fixed spamming the assets table with map tiles. The tile image ID is now ↵ | Diva Canto | 2010-05-09 | 2 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | stored in regionsettings. Upon generation of a new tile image, the old one is deleted. Tested for SQLite and MySql standalone. * Fixed small bug with map search where the local sim regions weren't found. | ||||
* | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-05-08 | 3 | -19/+19 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster | Kitto Flora | 2010-05-07 | 4 | -36/+84 |
| |\ \ \ | |||||
| * | | | | Fix Mouse+WASD makes Av rise; Fix PREJUMP. | Kitto Flora | 2010-05-07 | 3 | -19/+19 |
| | | | | | |||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-08 | 1 | -5/+16 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | GridUserService in place. Replaces the contrived concept of storing user's ↵ | Diva Canto | 2010-05-07 | 1 | -5/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway. BTW, the Meshing files want to be committed too -- EOFs. | ||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-05-06 | 2 | -3/+18 |
|\ \ \ \ \ | |/ / / / |