Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [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 |
| | |||||
* | Make the console output from the reigon console hookable | Melanie | 2012-08-18 | 1 | -0/+4 |
| | |||||
* | 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 | 3 | -0/+16 |
| | |||||
* | Allow the use of the region debug console found in recent viewers. This console | Melanie | 2012-08-14 | 1 | -0/+39 |
| | | | | | | | will be available to estate owners and managers. If the user using the console had god privs, they can use "set console on" and "set console off" to switch on the actual region console. This allows console access from within the viewer. The region debug console can coexist with any other main console. | ||||
* | Merge branch 'careminster' into avination | Melanie | 2012-08-14 | 3 | -4/+11 |
|\ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | ||||
| * | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 2 | -2/+2 |
| |\ | | | | | | | | | | | | | | | | | | | 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 | 2 | -2/+2 |
| | | | |||||
| * | | 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 'master' into careminster | Melanie | 2012-08-01 | 1 | -0/+4 |
|\ \ | |/ | |||||
| * | Adds support to ScriptModuleComms for region modules to export | Mic Bowman | 2012-07-31 | 1 | -0/+4 |
| | | | | | | | | constants to the script engine. | ||||
* | | 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 | 8 | -42/+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-27 | 1 | -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. | ||||
| * | | Remove duplicated IScenePresence.PresenceType. This is already in ↵ | Justin Clark-Casey (justincc) | 2012-07-27 | 1 | -2/+0 |
| | | | | | | | | | | | | | | | | | | ISceneAgent.PresenceType from which IScenePresence inherits. No other code changes required. | ||||
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Robert Adams | 2012-07-26 | 1 | -23/+46 |
| |\ \ | |||||
| | * | | When copying items, copy the item description field instead of the asset ↵ | Justin Clark-Casey (justincc) | 2012-07-26 | 1 | -23/+46 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | description field. If we copy the asset description then we will only ever replicate the very first description, if there was one, not any subsequent changes. Thanks to Oren Hurvitz of Kitely for this patch from http://opensimulator.org/mantis/view.php?id=6107 I have adapted it slightly to change the order of arguments (name before description rather than vice-versa) and slightly improve some method doc. | ||||
| * | | | Add a Dispose() of the physics engine when a scene is being shutdown. | Robert Adams | 2012-07-26 | 1 | -0/+9 |
| |/ / | |||||
| * | | Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring ↵ | Justin Clark-Casey (justincc) | 2012-07-25 | 1 | -0/+1 |
| | | | | | | | | | | | | with other monitoring code from OpenSim.Framework |