aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
* In ScenePresence, removed several private variables used to store public ↵Dan Lake2012-03-011-108/+44
| | | | parameters. They were only used by the get/set and make code harder to refactor.
* Take watchdog alarm calling back outside the m_threads lock.Justin Clark-Casey (justincc)2012-02-241-2/+2
| | | | This is how it was originally. This stops a very long running alarm callback from causing a problem.
* Get rid of some of the identical exception catching in Scene.Update().Justin Clark-Casey (justincc)2012-02-241-17/+1
|
* Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-241-3/+9
| | | | | | | | On the first frame, all startup scene objects are added to the physics scene. This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame. This commit also slightly changes the behaviour of timeout reporting. Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check. Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
* Try to resolve some problems with viewers crashing after hitting parcel ↵Justin Clark-Casey (justincc)2012-02-232-10/+20
| | | | | | | | | | banlines or freezing on the banline. This involves 1) On forcible teleport, call m_scene.RequestTeleportLocation() rather than ScenePresence.Teleport() - only EntityTransferModule now should call SP.Teleport() 2) When avatar is being forcibly moved due to banlines, use a 'stop movement' tolerance of 0.2 to requested position rather than 1 This prevents the avatar sometimes being stuck to banlines until they teleport somewhere else. This aims to fix some problems in http://opensimulator.org/mantis/view.php?id=5822
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-02-231-8/+2
|\
| * Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in ↵Justin Clark-Casey (justincc)2012-02-221-8/+2
| | | | | | | | constructor and never subsequent set to null.
* | Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-232-2/+5
|/ | | | | | potential bad update that places an object at the opposite side of the origin sim for a moment before actually crossing it. Especially important in grids like OSG where lag between sims is high.
* Restore the taskItem null check that I accidentally blatted in 5397a6dJustin Clark-Casey (justincc)2012-02-211-0/+9
| | | | This is a valid check because the caller could supply an invalid uuid.
* Fix problem with dragging child part inventory item to user inventory.Justin Clark-Casey (justincc)2012-02-211-11/+1
| | | | | This fixes the problem by fixing the permissions module to look at root part permissions rather than having to do this for every caller. Resolves http://opensimulator.org/mantis/view.php?id=5569
* Revert "Fix:Cannot drag inventory from child prim into inventory ↵Justin Clark-Casey (justincc)2012-02-211-8/+4
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5569" This reverts commit 15ce73caca9ea6448e34b95d344cbbf5c9507f6d. As per the COMMENTS in http://opensimulator.org/mantis/view.php?id=5569, I was going to fix this in a more general way.
* Fix:Cannot drag inventory from child prim into inventory ↵PixelTomsen2012-02-211-4/+8
| | | | http://opensimulator.org/mantis/view.php?id=5569
* Fix bug where NPCs would establish child agents on other neighbour regions ↵Justin Clark-Casey (justincc)2012-02-211-15/+14
| | | | that had come up after the NPC was created.
* More improvements on agent position updates: if the target sims fail, ↵Diva Canto2012-02-201-5/+2
| | | | blacklist them for 2 min, so that we don't keep doing remote calls that fail.
* Amend to last commit. This should have been committed too.Diva Canto2012-02-191-1/+1
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-02-192-9/+9
|\
| * Use localy defined name, TPFlags, for Constants.TeleportFlagsBlueWall2012-02-191-6/+6
| |
| * Fix:OmegaX, OmegaY and OmegaZ not saved for child prims ↵PixelTomsen2012-02-191-3/+3
| | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5893 Signed-off-by: nebadon <michael@osgrid.org>
* | A few more tweaks on position updates and create child agents. Mono hates ↵Diva Canto2012-02-192-7/+15
|/ | | | concurrent uses of the same TCP connection, and even of the connections to the same server. So let's stop doing it. This patch makes movement much smoother when there are lots of neighbours.
* Route logins according to Estate, Telehub and TeleportFlagsBlueWall2012-02-181-2/+4
|
* Propagate our teleport flags on loginsBlueWall2012-02-181-1/+4
|
* Fix a bug where changing shape parameters of a child prim in a linkset would ↵Justin Clark-Casey (justincc)2012-02-181-2/+2
| | | | | | not persist. Resolves http://opensimulator.org/mantis/view.php?id=5819
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-02-178-24/+159
|\
| * Add new and updated script eventsRobert Adams2012-02-172-3/+67
| |
| * Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-02-171-0/+21
| |\
| | * Fix missing telehub handling on loginBlueWall2012-02-171-0/+21
| | |
| * | Fix: Object owned by the group does not return to the last owner ↵PixelTomsen2012-02-162-2/+2
| | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5404
| * | If shape properties fail SOP parsing (e.g. due to commas instead of decimal ↵Justin Clark-Casey (justincc)2012-02-161-12/+22
| |/ | | | | | | | | | | points) print out one short message listing the failing node names rather than lots of exceptions. Adds skeleton bad float values deserialization test
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-151-0/+1
| |\
| * | In ObjectTortureTests, run garbage collector on Teardown and run scene loop ↵Justin Clark-Casey (justincc)2012-02-153-7/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | update when scene objects have been deleted. At least on mono 2.6.4, running GC.Collect() is not guaranteed to force gc of all objects when run in the same method where those objects had references. Therefore, GC.Collect() is now being done in the per-script teardown of ObjectTortureTests. In addition, scene loop update is being run after garbage collection in order to clean out the viewer update list of scene objects in the SceneGraph. These measures mean that scene objects/parts are now garbage collected after a test run if deleted from the scene, resulting in a much better memory usage report (though probably still not very accurate). However, deletion takes a very long time - what's really needed is to find out now why the entire scene isn't being GC'd by this measure. This change hasn't yet been applied to the other stress tests.
* | | Added the TriggerAvatarAppearanceChanged to EventManager. It's triggered by ↵Dan Lake2012-02-171-0/+24
| |/ |/| | | | | AvatarFactoryModule after an avatar's appearance has been succesfully changed and persisted (if the persist option is set).
* | Refactor appearance saving for NPC to use AvatarFactoryModule interface.Dan Lake2012-02-141-0/+1
|/
* Add some more data to the new user connection logging for debug purposes.Justin Clark-Casey (justincc)2012-02-141-3/+3
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-132-8/+6
|\
| * Make ScenePresence.MovementFlag a private only settable value to reduce ↵Justin Clark-Casey (justincc)2012-02-111-7/+4
| | | | | | | | complexity of code analysis
| * Fix bug where somebody taking a copy of an object they didn't own that was ↵Justin Clark-Casey (justincc)2012-02-101-1/+2
| | | | | | | | | | | | rezzed before the region was restarted would wrongly place the copy in the object owner's inventory. Addresses http://opensimulator.org/mantis/view.php?id=5825
* | On object deserialization, go back to logging errors at DEBUG level rather ↵Justin Clark-Casey (justincc)2012-02-131-5/+9
|/ | | | | | | | than ERROR. Restore extra log message if shape processing fails. Logging level was DEBUG before 312e145 (Fri Feb 3 2012). 312e145 also accidentally removed the 'general error' log message if any shape deserialization failed. This commit restores it, though this has no functional impact.
* When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer ↵Justin Clark-Casey (justincc)2012-02-102-0/+11
| | | | | | | | permissions, not PermissionMask.All Setting PermissionMask.All will cause next permissions to replace current permissions when the object is rezzed, since bit 4 will be set. This is not correct behaviour for a freshly uploaded mesh. Freshly rezzed in-world prims also do not have bit 4 set (don't yet know exactly what this is). Should resolve http://opensimulator.org/mantis/view.php?id=5651
* If NPCModule.CreateNPC() fails to create the required ScenePresence (which ↵Justin Clark-Casey (justincc)2012-02-091-1/+1
| | | | should in theory never happen), don't add the NPC to the npc list but return UUID.Zero instead.
* Stop a scene object from attempting to link with itself (which results in an ↵Justin Clark-Casey (justincc)2012-02-084-10/+54
| | | | | | exception and constant complaints in v3 viewers). Aims to address http://opensimulator.org/mantis/view.php?id=5878
* Add start GC memory and end GC memory to object stress test printouts.Justin Clark-Casey (justincc)2012-02-071-1/+2
| | | | | This illustrates that references to Scene, SOG, etc. are not currently being released when a stress test ends (or at regression test end in general). This means even the current stress tests take much more memory than they need, a problem that will have to be addressed.
* Add TestAddTaskInventoryItem()Justin Clark-Casey (justincc)2012-02-071-1/+25
|
* Remove debug logging if physics actor is null in SOP.ApplyPhysics()Justin Clark-Casey (justincc)2012-02-071-5/+1
| | | | This is not valid in the case of BasicPhysics which can return a null PhysicsActor (though I think it should really return a do-nothing PhysicsActor).
* Add a regression test to compile and start a script. Remove ↵Justin Clark-Casey (justincc)2012-02-071-8/+4
| | | | | | | | Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText(). The Path.GetDirectoryName call in Compiler.CompileFromDotNetText is unnecessary since AppDomain.CurrentDomain.BaseDirectory is always a directory. Later path concatenation is already done by Path.Combine() which handles any trailing slash. Removing Path.GetDirectoryName() will not affect the runtime but allows NUnit to work since it doesn't add a trailing slash to AppDomain.CurrentDomain.BaseDirectory.
* Make configuration uniformBlueWall2012-02-051-3/+3
| | | | Pickup the max physical prim size in Scene to make it uniform since adding code to get default size from the OpenSim*.ini.
* change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make thenebadon2012-02-041-1/+1
| | | | variable in OpenSim.ini and Regions.ini match
* Only look for an uploaded transactional asset in Scene.UpdateTaskInventory ↵Justin Clark-Casey (justincc)2012-02-043-22/+21
| | | | | | | | if we have been passed a non-zero transaction ID. This resolves the recent regression from deeb728 where notecards could not be saved in prim inventories. This looks like a better solution than deeb728 since only non-caps updates pass in a transaction ID. Hopefully resolves http://opensimulator.org/mantis/view.php?id=5873
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-031-8/+7
|\
| * Check for null scene in ScheduleFullUpdate and ScheduleTerseUpdate before ↵Dan Lake2012-02-031-4/+7
| | | | | | | | triggering events on a potentially null Scene
* | Change SceneObjectSerializer to use common ↵Justin Clark-Casey (justincc)2012-02-031-74/+29
| | | | | | | | | | | | ExternalRepresentationUtils.ExecuteReadProcessors() methods. Adds ability to submit a customized exception message to match logging.