aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'ubitwork' into avinationMelanie2012-08-303-35/+38
|\
| * Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-08-301-1/+2
| |\
| * | [possible still bad] make use of keyframemotion.copy on sop.copy, replacingUbitUmarov2012-08-303-35/+38
| | | | | | | | | | | | | | | fromdata(seralize). for now its called with null group since sop.copy() hasn't usable new group information, so for copied keyframes be fully operational UpdateSceneObject(newgroup) needs to be called on them.
* | | Sequence inventory descendents requests to reduce inventory server load andMelanie2012-08-301-5/+55
| |/ |/| | | | | movement lag.
* | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-08-295-134/+424
|\ \ | |/
| * A few more changes to keyframesUbitUmarov2012-08-293-64/+116
| |
| * [Potentially broken] keyframes changes.. since it's there, use timer forUbitUmarov2012-08-291-115/+165
| | | | | | | | crossing retries and not still another thread, etc...
| * [possible still very broken] mess around keyframes. timer eventsUbitUmarov2012-08-285-111/+299
| | | | | | | | threads overlaps, some null objects exceptions, region crossing...
* | Fix a nullref while object is being createdMelanie2012-08-281-1/+2
|/
* fix incoerence btw KFM_TRANSLATION and ROTATION LSL constants and internalUbitUmarov2012-08-261-2/+2
| | | | DataFormat enum, using values from the KFM constants
* Fix bad child prim permissions that can make objects change perms after rezzingMelanie2012-08-233-3/+39
|
* Make terrain save every 1000 frames instead of every 50. Database load is a ↵Melanie2012-08-221-1/+1
| | | | sim killer.
* Fix group return stuffMelanie2012-08-211-1/+1
|
* Cause a persistence save if prim flags changeMelanie2012-08-211-0/+2
|
* Add Camera Offsets to serializationMelanie2012-08-211-0/+14
|
* Remove AreUpdatesSuspended flag because it does nothingMelanie2012-08-162-24/+0
|
* Change case of areUpdatesSuspended to upper case as is proper for a propertyMelanie2012-08-162-8/+8
|
* Add support for the extra params to scene and the event managerMelanie2012-08-152-0/+62
|
* Add a skeleton for a name value storage associated with regionsMelanie2012-08-151-0/+4
|
* Merge branch 'careminster' into avinationMelanie2012-08-142-3/+10
|\ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs
| * Merge branch 'master' into careminsterMelanie2012-08-141-1/+1
| |\ | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| | * Lay some groundwork for temp attachments. Decouple attachments from inventory.Melanie2012-08-141-1/+1
| | |
| * | Merge branch 'master' into careminsterMelanie2012-08-042-2/+9
| |\ \ | | |/ | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| | * Restore SOG constructor chaining removed in recent 513b77b. This is not a ↵Justin Clark-Casey (justincc)2012-08-031-1/+1
| | | | | | | | | | | | functional change.
| | * Move previously unadvertised SendPeriodicAppearanceUpdates setting from ↵Justin Clark-Casey (justincc)2012-08-031-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [Startup] to [Appearance] config section. Add description and default of false (as before) to OpenSimDefaults.ini If set to true, this config switch will resend avatar appearance information (a small amount of UUID data, not the baked textures themselves) to other avatars in the sim every 60 seconds. For me, this has helped with situations where avatars appear persistently grey - the LL viewer sometimes did not appear to request assets the first time the appearance data was sent. However, this switch will not help with other appearance failure situations (e.g. failure to bake assets). This setting is experimental but will not have any significant impact on the simulator if turned to true.
* | | Merge branch 'ubitwork' into avinationMelanie2012-08-031-0/+7
|\ \ \
| * | | on presence close(), release animator and OnRegionHeartbeatEnd eventUbitUmarov2012-08-031-0/+7
| | | |
* | | | Merge branch 'careminster' into avinationMelanie2012-08-033-2/+13
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' into careminsterMelanie2012-08-033-2/+13
| |\ \ \ | | | |/ | | |/| | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| | * | refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match ↵Justin Clark-Casey (justincc)2012-08-032-2/+2
| | | | | | | | | | | | | | | | FromFolderID, FromItemID and to reflect that it's a SOP ID rather than a SOG ID.
| | * | Don't bothre setting RezzingObjectID to UUID.Zero in SOG constructor - this ↵Justin Clark-Casey (justincc)2012-08-031-3/+4
| | | | | | | | | | | | | | | | is already its default value as it's a struct.
| | * | ImprovedTerseObjectUpdate packet does not support shape updates, thus ↵SignpostMarv2012-08-031-1/+1
| | | | | | | | | | | | | | | | scheduling terse updates will not (and does not) update shape information in the viewer
| | * | Initialize the Rezzing object to UUID.ZeroMelanie2012-08-021-3/+4
| | | |
| | * | reduced-complexity implementation of function to get rezzing object keySignpostMarv2012-08-022-1/+10
| | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
* | | | Make WaitGetScenePresence wait for up to 20 secondsMelanie2012-08-031-1/+1
| |_|/ |/| |
* | | minor change avoiding a null referenceUbitUmarov2012-08-031-2/+4
| | |
* | | Make sure the position of a loggin-in agent is within region boundaries sinceMelanie2012-08-031-0/+9
|/ / | | | | | | out of bounds positions cause a rejection of the login.
* | Merge branch 'master' into careminsterMelanie2012-08-011-0/+16
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * Create the ability for physics modules to request assets on demand byMelanie2012-08-011-0/+16
| | | | | | | | | | | | themselves. For that, the physics module simply calls RequestAssetMethod, which in turn points to Scene.PhysicsRequestAsset. This gives physics access to the asset system without introducing unwanted knowledge of the scene class.
* | Merge branch 'avination' into careminsterMelanie2012-08-012-4/+12
|\ \
| * \ Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkMelanie2012-07-311-1/+3
| |\ \
| | * | Correct StandUp position and rotationMelanie2012-07-301-1/+3
| | | |
| * | | Reverse a senseless change in the prioritizer. Why I would want avatars to ↵Melanie2012-07-311-3/+9
| |/ / | | | | | | | | | render according to their camera position is beyond me.
* | | Merge branch 'avination' into careminsterMelanie2012-07-291-0/+3
|\ \ \ | |/ / | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | Fix an exception while outputting a log messageMelanie2012-07-291-1/+1
| | |
| * | See that if controls are taken, those are released before taking new onesMelanie2012-07-291-0/+3
| | |
* | | Fix some merge issues and a functional issue in the scene managerMelanie2012-07-281-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-07-287-40/+144
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Monitoring/BaseStatsCollector.cs OpenSim/Region/Application/OpenSim.cs OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/SceneManager.cs bin/OpenMetaverse.Rendering.Meshmerizer.dll bin/OpenMetaverse.StructuredData.dll bin/OpenMetaverse.dll bin/OpenMetaverseTypes.dll prebuild.xml
| * | Avoid a race condition between the scene shutdown thread and the update ↵Justin Clark-Casey (justincc)2012-07-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | thread since commit c150320 (Thu Jul 26 15:27:18 2012) c150320 started explicitly disposing of the physics scene and nulling it out on region shutdown. However, the update loop may not have yet checked Scene.ShuttingDown, particularly if avatars were not in the scene, causing failure when it tried to lookup time dilation. This commit moves the setting of m_shuttingDown above the existing 500ms pause to notify avatars that they are being kicked. This should not affect the few other places that use this flag.
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2012-07-261-23/+46
| |\ \