Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'avination' into ubitwork | UbitUmarov | 2012-08-31 | 1 | -5/+55 |
|\ | |||||
| * | Merge branch 'ubitwork' into avination | Melanie | 2012-08-30 | 3 | -35/+38 |
| |\ | |||||
| * | | Sequence inventory descendents requests to reduce inventory server load and | Melanie | 2012-08-30 | 1 | -5/+55 |
| | | | | | | | | | | | | movement lag. | ||||
* | | | move keyframemotion.copy from sop.copy to sog.copy, where there is | UbitUmarov | 2012-08-30 | 3 | -4/+8 |
| |/ |/| | | | | | newgroup information avaiable. | ||||
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-08-30 | 1 | -1/+2 |
|\ \ | |/ | |||||
| * | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | Melanie | 2012-08-29 | 5 | -134/+424 |
| |\ | |||||
| * | | Fix a nullref while object is being created | Melanie | 2012-08-28 | 1 | -1/+2 |
| | | | |||||
* | | | [possible still bad] make use of keyframemotion.copy on sop.copy, replacing | UbitUmarov | 2012-08-30 | 3 | -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. | ||||
* | | A few more changes to keyframes | UbitUmarov | 2012-08-29 | 3 | -64/+116 |
| | | |||||
* | | [Potentially broken] keyframes changes.. since it's there, use timer for | UbitUmarov | 2012-08-29 | 1 | -115/+165 |
| | | | | | | | | crossing retries and not still another thread, etc... | ||||
* | | [possible still very broken] mess around keyframes. timer events | UbitUmarov | 2012-08-28 | 5 | -111/+299 |
|/ | | | | threads overlaps, some null objects exceptions, region crossing... | ||||
* | fix incoerence btw KFM_TRANSLATION and ROTATION LSL constants and internal | UbitUmarov | 2012-08-26 | 1 | -2/+2 |
| | | | | DataFormat enum, using values from the KFM constants | ||||
* | Fix bad child prim permissions that can make objects change perms after rezzing | Melanie | 2012-08-23 | 3 | -3/+39 |
| | |||||
* | Make terrain save every 1000 frames instead of every 50. Database load is a ↵ | Melanie | 2012-08-22 | 1 | -1/+1 |
| | | | | sim killer. | ||||
* | Fix group return stuff | Melanie | 2012-08-21 | 1 | -1/+1 |
| | |||||
* | Cause a persistence save if prim flags change | Melanie | 2012-08-21 | 1 | -0/+2 |
| | |||||
* | Add Camera Offsets to serialization | Melanie | 2012-08-21 | 1 | -0/+14 |
| | |||||
* | Remove AreUpdatesSuspended flag because it does nothing | Melanie | 2012-08-16 | 2 | -24/+0 |
| | |||||
* | Change case of areUpdatesSuspended to upper case as is proper for a property | Melanie | 2012-08-16 | 2 | -8/+8 |
| | |||||
* | Add support for the extra params to scene and the event manager | Melanie | 2012-08-15 | 2 | -0/+62 |
| | |||||
* | Add a skeleton for a name value storage associated with regions | Melanie | 2012-08-15 | 1 | -0/+4 |
| | |||||
* | Merge branch 'careminster' into avination | Melanie | 2012-08-14 | 2 | -3/+10 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | ||||
| * | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 1 | -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. | Melanie | 2012-08-14 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-08-04 | 2 | -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-03 | 1 | -1/+1 |
| | | | | | | | | | | | | functional change. | ||||
| | * | Move previously unadvertised SendPeriodicAppearanceUpdates setting from ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -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 avination | Melanie | 2012-08-03 | 1 | -0/+7 |
|\ \ \ | |||||
| * | | | on presence close(), release animator and OnRegionHeartbeatEnd event | UbitUmarov | 2012-08-03 | 1 | -0/+7 |
| | | | | |||||
* | | | | Merge branch 'careminster' into avination | Melanie | 2012-08-03 | 3 | -2/+13 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2012-08-03 | 3 | -2/+13 |
| |\ \ \ | | | |/ | | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs | ||||
| | * | | refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 2 | -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-03 | 1 | -3/+4 |
| | | | | | | | | | | | | | | | | is already its default value as it's a struct. | ||||
| | * | | ImprovedTerseObjectUpdate packet does not support shape updates, thus ↵ | SignpostMarv | 2012-08-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | scheduling terse updates will not (and does not) update shape information in the viewer | ||||
| | * | | Initialize the Rezzing object to UUID.Zero | Melanie | 2012-08-02 | 1 | -3/+4 |
| | | | | |||||
| | * | | reduced-complexity implementation of function to get rezzing object key | SignpostMarv | 2012-08-02 | 2 | -1/+10 |
| | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | | | Make WaitGetScenePresence wait for up to 20 seconds | Melanie | 2012-08-03 | 1 | -1/+1 |
| |_|/ |/| | | |||||
* | | | minor change avoiding a null reference | UbitUmarov | 2012-08-03 | 1 | -2/+4 |
| | | | |||||
* | | | Make sure the position of a loggin-in agent is within region boundaries since | Melanie | 2012-08-03 | 1 | -0/+9 |
|/ / | | | | | | | out of bounds positions cause a rejection of the login. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2012-08-01 | 1 | -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 by | Melanie | 2012-08-01 | 1 | -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 careminster | Melanie | 2012-08-01 | 2 | -4/+12 |
|\ \ | |||||
| * \ | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork | Melanie | 2012-07-31 | 1 | -1/+3 |
| |\ \ | |||||
| | * | | Correct StandUp position and rotation | Melanie | 2012-07-30 | 1 | -1/+3 |
| | | | | |||||
| * | | | Reverse a senseless change in the prioritizer. Why I would want avatars to ↵ | Melanie | 2012-07-31 | 1 | -3/+9 |
| |/ / | | | | | | | | | | render according to their camera position is beyond me. | ||||
* | | | Merge branch 'avination' into careminster | Melanie | 2012-07-29 | 1 | -0/+3 |
|\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| * | | Fix an exception while outputting a log message | Melanie | 2012-07-29 | 1 | -1/+1 |
| | | | |||||
| * | | See that if controls are taken, those are released before taking new ones | Melanie | 2012-07-29 | 1 | -0/+3 |
| | | | |||||
* | | | Fix some merge issues and a functional issue in the scene manager | Melanie | 2012-07-28 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2012-07-28 | 7 | -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 |