aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-10-3011-139/+129
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * Add missing max_listens_per_region to [LL_Functions] config section in ↵Justin Clark-Casey (justincc)2011-10-291-0/+4
| | | | | | | | | | | | OpenSimDefaults.ini + explanation. This setting controls the maximum number of listeners in a region
| * Remove the SyncRoot locking from Scene which was only being done around the ↵Justin Clark-Casey (justincc)2011-10-293-32/+18
| | | | | | | | | | | | main physics loop and ScenePresence position and velocity setting This is no longer necessary with ODECharacter taints (ODEPrim was already not taking part in this). BSCharacter was already tainting.
| * Add taint target velocity for ODECharacters as is already done for ↵Justin Clark-Casey (justincc)2011-10-291-7/+12
| | | | | | | | | | | | | | ODECharacter position and position and velocity for ODEPrims. This is to help stop surprises if the velocity is set in the middle of physics calculations, though this probably isn't a huge problem. It's more for consistency and for the next step of removing some scene locks
| * tidy up OdeCharacter so that we just use OpenMetaverse.Vector3 assignment ↵Justin Clark-Casey (justincc)2011-10-291-51/+39
| | | | | | | | | | | | directly where possible, instead of transferring X, Y and Z components separately some of this is probably a hold over from using ODE.Vector3, which is still necessary in some places.
| * Move position set from taint to logically better position at top of ↵Justin Clark-Casey (justincc)2011-10-291-12/+12
| | | | | | | | ODECharacter.ProcessTaints() though this makes no practical difference
| * Stop setting _position as well as m_taint_position in ODECharacter.PositionJustin Clark-Casey (justincc)2011-10-292-6/+3
| | | | | | | | | | setting position at the same time as taint appears to undermine the whole purpose of taint testing doesn't reveal any obvious regressions in doing this
| * Remove completely unused SOG.Rotation parameterJustin Clark-Casey (justincc)2011-10-293-18/+10
| | | | | | | | We always use SOP.Rotation instead
| * set grp.RootPart.GroupPosition for code consistency (and readability) rather ↵Justin Clark-Casey (justincc)2011-10-282-7/+2
| | | | | | | | than calling SOP.OffsetForNewRegion
| * Add missing doc to rotation/position methods in SOGJustin Clark-Casey (justincc)2011-10-281-5/+5
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-2822-227/+171
| |\
| * | fetch SOP.RotationOffset once in UpdateRotation() and compare rather than ↵Justin Clark-Casey (justincc)2011-10-282-6/+21
| | | | | | | | | | | | | | | | | | fetch four separate times. No functional change.
* | | Fix the offline message module to revert core changes and restore avnMelanie2011-10-281-18/+28
| | | | | | | | | | | | specific behavior
* | | Reduce severity and remove duplication if a common log message regardingMelanie2011-10-281-3/+1
| | | | | | | | | | | | baked textures
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-2727-218/+209
|\ \ \
| * \ \ Merge branch 'master' into bigmergeMelanie2011-10-2727-218/+209
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | Removed use of 'is' operator and casting to find the root ScenePresence in ↵Dan Lake2011-10-274-82/+53
| | | | | | | | | | | | | | | | MessageTransfer modules and Groups module.
| | * | Continuation of previous checkin. Found more places where ↵Dan Lake2011-10-274-57/+39
| | | | | | | | | | | | | | | | ForEachScenePresence can be changed to ForEachRootScenePresence.
| | * | Added new ForEachRootScenePresence to Scene since almost every delegate ↵Dan Lake2011-10-2714-88/+79
| | |/ | | | | | | | | | passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors.
| | * For now, comment out error message on new script engine console commands.Justin Clark-Casey (justincc)2011-10-271-1/+4
| | | | | | | | | | | | This causes false positives if a simulator has more than 1 region and the current region is 'root' since this sends the command separately to each region and each region has its own XEngine
| | * Comment out inventory folder bulk update code on InventoryAccepted message ↵Justin Clark-Casey (justincc)2011-10-271-12/+18
| | | | | | | | | | | | | | | | | | | | | | | | introduced in commit db91044 on Aug 22 2011 This should be unecessary since the folder update is already made at the time of the offer (and moved to trash if not accepted). This code was also not taking into account the situation where an item was accepted. Needs more fixing if this results in an aggression elsewhere.
| | * Don't blow our brains out if LLClientView.BulkInventoryUpdate() is wrongly ↵Justin Clark-Casey (justincc)2011-10-271-1/+3
| | | | | | | | | | | | | | | | | | passed a null node reference. Addresses worst aspect of http://opensimulator.org/mantis/view.php?id=5752
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-10-276-15/+124
| | |\
| | * | Fix a bug I introduced yesterday in ODE physics where prim scripts would ↵Justin Clark-Casey (justincc)2011-10-273-1/+26
| | | | | | | | | | | | | | | | only receive the very first collision.
* | | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-2664-226/+596
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' into bigmergeMelanie2011-10-2610-22/+120
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2011-10-261-1/+17
| | |\ \
| | | * \ Merge branch 'master' of /home/opensim/src/OpenSimBlueWall2011-10-262-4/+18
| | | |\ \
| | | * | | Add some things to .gitignore to make the status cleanerBlueWall2011-10-261-1/+17
| | | | | |
| | * | | | Added optional owner classes to existing OSSL agent PermissionsMichelle Argus2011-10-263-6/+75
| | | |/ / | | |/| | | | | | | | | | | | | | | | | | | | | | PARCEL_GROUP, PARCEL_OWNER, ESTATE_MANAGER and REGION_OWNER can be combined with the existing agent uuid option to limit ossl functions to agents and owner classes. Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| | * | | Implementation of PRIM_OMEGA, but only for settingSignpostMarv Martin2011-10-262-4/+18
| | |/ / | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| | * | Implementing PRIM_LINK_TARGET, but only for setting paramsSignpostMarv Martin2011-10-262-4/+14
| | |/ | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | Merge branch 'master' into bigmergeMelanie2011-10-2655-210/+482
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| | * Restart the event queue worker threads that I accidentally disabled earlier ↵Justin Clark-Casey (justincc)2011-10-252-9/+11
| | | | | | | | | | | | | | | | | | today in 8a0a78c. Also adds these to the watchdogs with very large timeouts (should really be infinite)
| | * In Watchdog, add ability to specific timeout for a thread.Justin Clark-Casey (justincc)2011-10-251-16/+56
| | | | | | | | | | | | This also changes the point of registration to the StartThread() call rather than the first Update()
| | * Add m_threads dictionary locking to Watchdog.GetThreads()Justin Clark-Casey (justincc)2011-10-251-1/+2
| | |
| | * Clear OdeCharacter CollisionEventUpdate when we subscribe or unsubscribe ↵Justin Clark-Casey (justincc)2011-10-251-0/+2
| | | | | | | | | | | | from collision events
| | * Remove unused fields from CollisionEventUpdateJustin Clark-Casey (justincc)2011-10-255-28/+10
| | |
| | * Get rid of the pointless null checks on collision listeners. Add warning ↵Justin Clark-Casey (justincc)2011-10-253-7/+6
| | | | | | | | | | | | about synchronicity for PhysicsActor.OnCollisionUpdate event doc
| | * When sending object collision updates, don't null out and recreate the ↵Justin Clark-Casey (justincc)2011-10-252-13/+8
| | | | | | | | | | | | CollisionEventUpdate() if the number of collisions falls to zero. Reuse the existing one instead.
| | * For ScenePresence collision events, instead of creating a new ↵Justin Clark-Casey (justincc)2011-10-253-9/+17
| | | | | | | | | | | | | | | | | | CollisionEventsThisFrame every time we need to send some new ones, reuse the existing one instead. This assumes that the listener is using the data synchronously, which is currently the case.
| | * Fix bug where collision event listeners were not removed once the listener ↵Justin Clark-Casey (justincc)2011-10-251-4/+5
| | | | | | | | | | | | | | | | | | | | | had gone away. This was causing continuous use of temporary memory even when all avatars had left the scene. Memory does leak but it does cause more calls to the garbage collector, which would pause the scene thread for a very short while during collection.
| | * minor: rename a parameter in OdeScene.Simulate() from actor -> prim since ↵Justin Clark-Casey (justincc)2011-10-251-4/+4
| | | | | | | | | | | | it's an OdePrim
| | * Add new LindenCaps test dll to panda run as well as "nant test"Justin Clark-Casey (justincc)2011-10-251-0/+5
| | |
| | * minor: add "threads show" as synonym for "show threads" for consistencyJustin Clark-Casey (justincc)2011-10-251-0/+5
| | |
| | * Add "threads abort <thread-id>" simulator console command that allows us to ↵Justin Clark-Casey (justincc)2011-10-252-2/+48
| | | | | | | | | | | | | | | | | | abort a watchdog managed thread. This is for diagnostic purposes.
| | * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵Justin Clark-Casey (justincc)2011-10-2544-130/+308
| | | | | | | | | | | | | | | | | | | | | | | | | | | of the other way around. This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes. Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
* | | Fix a missing locking callMelanie2011-10-251-0/+1
|/ /
* | Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmergeMelanie2011-10-251-12/+2
|\ \ | |/
| * Drop some unnecessary ContainsKey() checking before Remove() in BaseHttpServer()Justin Clark-Casey (justincc)2011-10-241-12/+2
| | | | | | | | Remove() presumably does this check anyway since it just returns false if the key is not in the collection.
generated by cgit v1.1 at 2024-12-23 03:25:27 +0000