aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into bigmergeMelanie2011-11-0313-107/+112
|\ | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneGraph.cs OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2011-11-0213-101/+109
| |\
| | * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-025-329/+394
| | |\
| | | * Get some hopefully more useful exception information when ↵Justin Clark-Casey (justincc)2011-11-022-5/+8
| | | | | | | | | | | | | | | | OpenJPEG.EncodeFromImage() fails in VectorRender and DynamicTexture modules
| | | * Fix race condition that would sometimes send or save appearance for the ↵Justin Clark-Casey (justincc)2011-11-022-9/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | wrong avatar. In AvatarFactoryModule.HandleAppearanceUpdateTimer(), we loop through appearance save and send requests and dispatch via a FireAndForget thread. If there was more than one request in the save or send queue, then this led to a subtle race condition where the foreach loop would load in the next KeyValuePair before the thread was dispatched. This gave the thread the wrong avatar ID, leaving some avatar appearance cloudy since appearance data was never sent. This change loads the fields into local references so that this doesn't happen.
| | * | Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.Dan Lake2011-11-0210-87/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on SOP consistently now. Also started working toward eliminating those calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule from outside SOP in favor of just setting properties on SOP and let SOP decide if an update should be scheduled. This consolidates the update policy within SOP and the client rather than everywhere that makes changes to SOP. Some places forget to call update while others call it multiple times, "just to be sure". UpdateFlag and Schedule*Update will both be made private shortly. UpdateFlag is intended to be transient and internal to SOP so it has been removed from XML serializer for SOPs.
| * | | Port the Avination offline messaging system to CoreMelanie2011-11-024-23/+37
| | |/ | |/|
* | | Merge branch 'master' into bigmergeMelanie2011-11-021-322/+350
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Restore the recursive calling of PRIM_LINK_TARGET because the version I madeMelanie2011-11-021-327/+334
| | | | | | | | | | | | breaks LINK_SET et al.
| * | Some positioning fixes from AVN trunkMelanie2011-11-021-1/+42
| | |
* | | Merge branch 'master' into bigmergeMelanie2011-11-022-6/+1
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Streamline PRIM_LINK_TARGET, eliminating a recursion and a failure scenarioMelanie2011-11-021-4/+3
| |/
| * Removed redundant SceneContents property from Scene. It's the same as ↵Dan Lake2011-11-012-6/+1
| | | | | | | | SceneGraph property.
* | Merge branch 'master' into bigmergeMelanie2011-11-021-10/+7
|\ \ | |/
| * Part 2 of see_into_this_sim_from_neighbor configuration option removalDan Lake2011-11-011-10/+7
| |
* | Merge branch 'master' into bigmergeMelanie2011-11-017-64/+36
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * Removed see_into_this_sim_from_neighbor configuration option.Dan Lake2011-11-012-11/+1
| |
| * Add "appearance send" command to allow manual sending of appearance.Justin Clark-Casey (justincc)2011-11-012-4/+21
| |
| * Removed unused show commands from Scene.cs and SceneBase.cs. The show ↵Dan Lake2011-10-313-48/+13
| | | | | | | | modules command in OpenSim.cs now shows both shared modules and region modules.
| * Adding green dots to map response should be for root agents onlyDan Lake2011-10-311-1/+1
| |
* | Merge branch 'master' into bigmergeMelanie2011-10-311-27/+25
|\ \ | |/
| * Fix line endingsDan Lake2011-10-301-23/+23
| |
| * Experimental reorder of Heartbeat loop now simulates physics and sends ↵Dan Lake2011-10-301-29/+27
| | | | | | | | updates to clients prior to sleep. Existing behavior was to sleep BEFORE sending updates. We found this patch reduced latency to clients by 1-2 heartbeat periods.
* | Merge branch 'master' into bigmergeMelanie2011-10-3010-139/+125
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * 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-273-14/+93
| | |\
| | * | 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-2640-81/+166
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' into bigmergeMelanie2011-10-266-13/+89
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * | Added optional owner classes to existing OSSL agent PermissionsMichelle Argus2011-10-261-6/+61
| | | | | | | | | | | | | | | | | | | | | | | | 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>
generated by cgit v1.1 at 2024-12-23 00:18:44 +0000