aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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-231-1/+7
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * 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' into careminster-presence-refactorMelanie2010-05-219-321/+349
|\ \ | |/
| * 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-215-267/+173
| | |\ \
| | * | | 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-215-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-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-211-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-211-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 testJustin Clark-Casey (justincc)2010-05-212-4/+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-212-27/+38
|\ \ | |/
| * Merging slimupdates2unknown2010-05-203-88/+91
| |\
| | * 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.
| | * * Initial commit of the slimupdates2 rewrite. This pass maintains the ↵unknown2010-05-122-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 ↵Melanie2010-05-211-82/+49
| | | | | | | | | | | | now only be for simultaneous add/removes of scene presences from the scene.
* | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-05-212-22/+54
|\ \ \
| * | | Change the way the object perms are propagated to attempt to salvageMelanie2010-05-211-21/+23
| | | | | | | | | | | | | | | | some older content
| * | | Fix a nullref issue in SitAltitudeCallbackTom Grimshaw2010-05-191-50/+53
| | | |
* | | | Initialise m_initialSitTarget to ZERO_VACTOR for safety's sake as per convo ↵Tom Grimshaw2010-05-191-1/+1
| | | | | | | | | | | | | | | | with kitto
* | | | Fix a nullref issue in SitAltitudeCallbackTom Grimshaw2010-05-191-6/+9
| | | |
* | | | Don't send kill packets to child agents as we close themTom Grimshaw2010-05-181-2/+2
| | | |
* | | | Fix to the scenario where we send an agent to a neighbouring sim (via ↵Tom Grimshaw2010-05-182-6/+19
| | | | | | | | | | | | | | | | 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 Grimshaw2010-05-181-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 Grimshaw2010-05-171-1/+1
| | | | | | | | | | | | | | | | the effect of killing a newly connected client.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-161-23/+14
|\ \ \ \ | | |/ / | |/| |
| * | | Fixes mantis #4622.Diva Canto2010-05-161-23/+14
| | | |
* | | | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-05-163-11/+61
|\ \ \ \ | | | | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | | Kill some locks that have crept into SOGTom Grimshaw2010-05-121-2/+12
| | | | |
| * | | | Optimise the heavily used GetScenePresences; eliminate the array->list ↵Tom Grimshaw2010-05-121-8/+48
| | | | | | | | | | | | | | | | | | | | conversion on every call and transition from hard locks to ReaderWriter locks.
| * | | | Fix another ReaderWriterLockSlim issueTom Grimshaw2010-05-101-1/+1
| | | | |
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-163-24/+77
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Finalized the client's TCP IP address verification process for HG1.5.Diva Canto2010-05-153-24/+77
| | |/ | |/|
* | | Fix overlooked readLock which was left openTom Grimshaw2010-05-101-1/+2
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-101-2/+4
|\ \ \ | |/ /
| * | * Fixed spamming the assets table with map tiles. The tile image ID is now ↵Diva Canto2010-05-091-2/+4
| | | | | | | | | | | | | | | | | | 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-refactorMelanie2010-05-083-19/+19
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of ssh://3dhosting.de/var/git/careminsterKitto Flora2010-05-073-36/+81
| |\ \
| | * | Fix linking issue introduced in my earlier commitMelanie Thielker2010-04-301-1/+19
| | | |
| * | | Fix Mouse+WASD makes Av rise; Fix PREJUMP.Kitto Flora2010-05-073-19/+19
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-081-5/+16
|\ \ \ \ | | |_|/ | |/| |
| * | | GridUserService in place. Replaces the contrived concept of storing user's ↵Diva Canto2010-05-071-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.