aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'master' into bigmergeMelanie2011-11-041-2/+3
|\ \ | |/
| * On standup, trigger the changed link script event after the avatar has been ↵Justin Clark-Casey (justincc)2011-11-041-2/+3
| | | | | | | | | | | | | | | | fully changed. This was meant to help with the script in http://opensimulator.org/mantis/view.php?id=5772 but it doesn't work. Probably the event is fired before the physics actor has been set up again for the stood avatar. Fixing that would be much more complicated, but processing the event last of all seems like a good idea in any case.
* | Merge branch 'master' into bigmergeMelanie2011-11-046-56/+48
|\ \ | |/ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/CoreModules/LightShare/LightShareModule.cs OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
| * Rename ForEachAvatar back to ForEachScenePresence. The other changesDan Lake2011-11-035-13/+13
| | | | | | | | | | | | from previous commit which sort out which iterator is used are left intact. A discussion is needed as to what constitutes an avatar vs a ScenePresence.
| * Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls toDan Lake2011-11-036-63/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | the 3 iteration functions so more of them are using the correct iteration for the action they are performing. The 3 iterators that seem to fit all actions within OpenSim at this time are: ForEachAvatar: Perform an action on all avatars (root presences) ForEachClient: Perform an action on all clients (root or child clients) ForEachRootClient: Perform an action on all clients that have an avatar There are still a dozen places or so calling the old ForEachScenePresence that will take a little more refactoring to eliminate.
* | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-11-027-82/+73
|\ \
| * \ Merge branch 'master' into bigmergeMelanie2011-11-037-82/+73
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | 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-027-76/+69
| | |\
| | | * Merge branch 'master' of git://opensimulator.org/git/opensimDan Lake2011-11-021-2/+3
| | | |\
| | | | * Fix race condition that would sometimes send or save appearance for the ↵Justin Clark-Casey (justincc)2011-11-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-027-74/+66
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-021-1/+1
| | |/
* | | Fix link order when linking sets to setsMelanie2011-11-022-40/+18
|/ /
* | Merge branch 'master' into bigmergeMelanie2011-11-021-5/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * Removed redundant SceneContents property from Scene. It's the same as ↵Dan Lake2011-11-011-5/+0
| | | | | | | | 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-014-62/+4
|\ \ | |/ | | | | | | 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-011-3/+3
| |
| * Removed unused show commands from Scene.cs and SceneBase.cs. The show ↵Dan Lake2011-10-312-48/+0
| | | | | | | | modules command in OpenSim.cs now shows both shared modules and region modules.
* | 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-306-66/+62
|\ \ | |/ | | | | | | 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.
| * Remove completely unused SOG.Rotation parameterJustin Clark-Casey (justincc)2011-10-292-17/+9
| | | | | | | | We always use SOP.Rotation instead
| * set grp.RootPart.GroupPosition for code consistency (and readability) rather ↵Justin Clark-Casey (justincc)2011-10-281-5/+0
| | | | | | | | 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-285-71/+76
| |\
| * | 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.
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-275-71/+78
|\ \ \
| * \ \ Merge branch 'master' into bigmergeMelanie2011-10-275-71/+78
| |\ \ \ | | | |/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | 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
| | * | Continuation of previous checkin. Found more places where ↵Dan Lake2011-10-272-36/+26
| | | | | | | | | | | | | | | | ForEachScenePresence can be changed to ForEachRootScenePresence.
| | * | Added new ForEachRootScenePresence to Scene since almost every delegate ↵Dan Lake2011-10-273-35/+50
| | |/ | | | | | | | | | passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors.
| | * Fix a bug I introduced yesterday in ODE physics where prim scripts would ↵Justin Clark-Casey (justincc)2011-10-271-0/+2
| | | | | | | | | | | | only receive the very first collision.
* | | Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmergeMelanie2011-10-264-12/+8
|\ \ \ | |/ /
| * | Merge branch 'master' into bigmergeMelanie2011-10-261-1/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Merge branch 'master' into bigmergeMelanie2011-10-263-11/+7
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Framework/Watchdog.cs
| | * Get rid of the pointless null checks on collision listeners. Add warning ↵Justin Clark-Casey (justincc)2011-10-252-7/+0
| | | | | | | | | | | | about synchronicity for PhysicsActor.OnCollisionUpdate event doc
| | * For ScenePresence collision events, instead of creating a new ↵Justin Clark-Casey (justincc)2011-10-251-4/+6
| | | | | | | | | | | | | | | | | | 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.
| | * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead ↵Justin Clark-Casey (justincc)2011-10-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmergeMelanie2011-10-251-1/+3
|\ \ | |/
| * Add new EventQueueTests with basic test to check that adding a client ↵Justin Clark-Casey (justincc)2011-10-241-1/+3
| | | | | | | | registers an http poll
* | Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmergeMelanie2011-10-251-4/+4
|\ \ | |/
| * Comment out the uuid gatherer lines that I accidentally left in.Justin Clark-Casey (justincc)2011-10-231-4/+4
| |
* | Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmergeMelanie2011-10-252-16/+48
|\ \ | |/
| * Get UUIDGatherer to scan notecards in the graph for asset uuids.Justin Clark-Casey (justincc)2011-10-222-16/+48
| | | | | | | | | | This is to support npc baked texture saving in oars and iars. May address http://opensimulator.org/mantis/view.php?id=5743
* | Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmergeMelanie2011-10-251-2/+8
|\ \ | |/
generated by cgit v1.1 at 2024-12-23 11:27:52 +0000