aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'careminster-presence-refactor' of ↵Tom Grimshaw2010-05-2912-249/+269
|\ | | | | | | ssh://3dhosting.de/var/git/careminster into careminster-presence-refactor
| * Merge branch 'master' into careminster-presence-refactorMelanie2010-05-2812-249/+269
| |\
| | * get TestSaveIarV0_1() uncommented but not running as a test yet since I ↵Justin Clark-Casey (justincc)2010-05-282-106/+101
| | | | | | | | | | | | didn't get the authentication server to work and my brain is about to fizzle out my ears
| | * restore InventoryArchiverTests.TestReplicateArchivePathToUserInventory() to ↵Justin Clark-Casey (justincc)2010-05-281-51/+37
| | | | | | | | | | | | work with the new UserAccountService/InventoryService
| | * fission UserAccountService.HandleCreateUser() into two methods, one which ↵Justin Clark-Casey (justincc)2010-05-281-52/+50
| | | | | | | | | | | | handles user command parsing and another which actually does the work
| | * Add ability to load IARs directly from URIsJustin Clark-Casey (justincc)2010-05-283-7/+43
| | | | | | | | | | | | | | | | | | | | | | | | So, something like load iar Justin Clark-Casey / PASSWORD http://justincc.org/downloads/iars/my-great-items.iar Will load my IAR directly from the web.
| | * minor: remove mono compiler warningJustin Clark-Casey (justincc)2010-05-281-1/+1
| | |
| | * tidy up help information on load oar and save oarJustin Clark-Casey (justincc)2010-05-281-5/+11
| | |
| | * refactor: move GetStream and URI methods from ArchiveReadRequest -> ↵Justin Clark-Casey (justincc)2010-05-283-64/+65
| | | | | | | | | | | | ArchiveHelpers
| | * Adjust Scene.DeleteAllSceneObjects() to not delete objects attached to avatars.Justin Clark-Casey (justincc)2010-05-281-2/+6
| | | | | | | | | | | | | | | This is going to be the right behaviour in all cases, I should think. This means that avatars in region when an oar is loaded do not lose their attachments
| | * Simplify AddFullUpdateToAvatars()/AddPartialUpdateToAvatars() by calling the ↵Justin Clark-Casey (justincc)2010-05-281-2/+5
| | | | | | | | | | | | object's corresponding single avatar update method, rather than calling the sceneviewer directly
| | * remove redundant ScenePresence.QueuePartForUpdate() - every place in the ↵Justin Clark-Casey (justincc)2010-05-281-9/+0
| | | | | | | | | | | | code calls SceneViewer.QueuePartForUpdate() directly
| | * Prevent a null refMelanie Thielker2010-05-271-0/+3
| | |
| | * Revert "Comment noisy "CONNECTION DEBUGGING" messages, because they push more"Melanie2010-05-272-14/+2
| | | | | | | | | | | | | | | | | | Some other stuff snuck in. This reverts commit 4cc533e7ad94d148351c16f48afd2a688a64c48a.
| | * Comment noisy "CONNECTION DEBUGGING" messages, because they push moreMelanie Thielker2010-05-272-2/+14
| | | | | | | | | | | | important stuff off screen too fast
| | * Just because there is an agent update handler, that doesn't mean there isMelanie Thielker2010-05-261-3/+4
| | | | | | | | | | | | a pre agent update handler. Null check these separately.
* | | Stop IGridService from throwing a fatal exception when an IPEndPoint cannot ↵Tom Grimshaw2010-05-291-11/+20
|/ / | | | | | | be resolved, and add some handlers to deal with this cleanly; a condition was observed on OSGrid where a neighbouring region with an invalid (unresolveable) hostname would prevent a region from starting. This is bad.
* | Merge branch 'careminster-presence-refactor' of ↵Mike Rieker2010-05-2711-12/+132
|\ \ | | | | | | | | | www.3dhosting.de:/var/git/careminster into careminster-presence-refactor
| * | Prevent a null refMelanie Thielker2010-05-271-0/+3
| | |
| * | Just because there is an agent update handler, that doesn't mean there isMelanie Thielker2010-05-261-3/+4
| | | | | | | | | | | | a pre agent update handler. Null check these separately.
| * | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-261-2/+1
| |\ \ | | |/
| | * fix sculpt normal direction for mirrored plane sculptsdahlia2010-05-241-2/+1
| | |
| * | 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 ↵Justin Clark-Casey (justincc)2010-05-241-2/+3
| | | | | | | | | | | | attachments
| | * 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
| |\ \ | | |/ | | | | | | | | | 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-214-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.
* | | | fix hanging output throttle arithmeticMike Rieker2010-05-271-39/+27
|/ / / | | | | | | | | | had multiply overflow and subtract wrap-around errors
* | | 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 ↵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-219-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-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-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-214-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 testJustin Clark-Casey (justincc)2010-05-214-7/+38
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-211-9/+7
|\ \ | |/