| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-03-03 | 2 | -18/+38 | |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs | |||||
| | * | | Make Keyframe motion cross regions again | Melanie | 2013-03-03 | 2 | -2/+4 | |
| | | | | ||||||
| | * | | Fix an issue where the viewer would request the seed cap before | Melanie | 2013-02-18 | 1 | -16/+34 | |
| | | | | | | | | | | | | | there was a handler for it. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-28 | 2 | -18/+13 | |
| |\ \ \ | | |/ | |/| | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs | |||||
| | * | | Add regression tests for llGetNotecardLine() | Justin Clark-Casey (justincc) | 2013-02-28 | 1 | -2/+2 | |
| | | | | ||||||
| | * | | Get "show modules" console command to obey selected command line region/s | Justin Clark-Casey (justincc) | 2013-02-27 | 1 | -16/+11 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-26 | 1 | -2/+9 | |
| |\ \ \ | |/ / | ||||||
| | * | | Move map related settings from [Startup] to a new [Map] section in OpenSim.ini | Justin Clark-Casey (justincc) | 2013-02-25 | 1 | -2/+9 | |
| | | | | | | | | | | | | | | | | | | | | | | Existing map settings in [Startup] will continue to work, and if present will override anything in [Map] However, the proper place for such settings would now be [Map] This is to reduce the use of [Startup] as a bag for non-generic settings which should really go in sections, in common with other settings. This commit also extends Diva's previous work to allow a default setting to be given when looking at multiple sections for settings. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-23 | 1 | -0/+6 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs | |||||
| | * | | minor: Add doc to ScenePresence.IsInTransit to make it clear that this is ↵ | Justin Clark-Casey (justincc) | 2013-02-22 | 1 | -0/+6 | |
| | | | | | | | | | | | | | set only for region crossing and not teleport, etc. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-22 | 1 | -1/+5 | |
| |\ \ \ | |/ / | ||||||
| | * | | * Fix walking to <NaN, NaN, NaN> via autopilot. | teravus | 2013-02-16 | 1 | -1/+5 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-16 | 3 | -5/+5 | |
| |\ \ \ | |/ / | ||||||
| | * | | Add regression test TestSaveNonRootFolderToIar | Justin Clark-Casey (justincc) | 2013-02-16 | 3 | -5/+5 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-15 | 2 | -1/+60 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
| | * | | Add EventManager events triggered when a SOP is added or removed | Robert Adams | 2013-02-14 | 2 | -0/+57 | |
| | | | | | | | | | | | | | from the physical scene. Invocations added in SceneObjectPart. | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-02-14 | 1 | -20/+75 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Revert "Make keyframes use the sim's frame timer" | Melanie | 2013-02-12 | 1 | -8/+15 | |
| | | | | | | | | | | | | | This reverts commit e85a6237bfc0f00de4a183e29e515fa5baf1aa7f. | |||||
| | * | | Revert "Push updates from keyframe directly to the front of the output queue ↵ | Melanie | 2013-02-12 | 3 | -24/+9 | |
| | | | | | | | | | | | | | | | | | | | rather" This reverts commit 04235e58e87ae42617111cad2884e42785914d4e. | |||||
| | * | | Push updates from keyframe directly to the front of the output queue rather | Melanie | 2013-02-12 | 3 | -9/+24 | |
| | | | | | | | | | | | | | than through the update system. | |||||
| | * | | Make keyframes use the sim's frame timer | Melanie | 2013-02-11 | 1 | -15/+8 | |
| | | | | ||||||
| | * | | Refactor KeyframeMotion to use one timer class per scene | Melanie | 2013-02-11 | 1 | -20/+75 | |
| | | | | ||||||
| | * | | Actually plumb the new values to physics. | Melanie | 2013-02-07 | 1 | -0/+20 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-10 | 2 | -2/+18 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Fix code to check for no spawn points. Possibly a merge artefact? | Melanie | 2013-02-10 | 1 | -2/+4 | |
| | | | | ||||||
| | * | | Fix teleport/telehub issue: | BlueWall | 2013-02-10 | 2 | -3/+17 | |
| | | | | | | | | | | | | | Fix bug that allowed only login access to regions with mis-configured telehubs. Administrators now have teleport access when there exists a mis-configured telehub in the region. Estate owners are now placed at region center in the absence of spawnpoints instead of being denied access. Grid Gods are unrestricted. All others are denied access to the region until spawnpoints are assigned to the telehub object. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-08 | 1 | -4/+18 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs | |||||
| | * | | If a component of a coalesced object fails to deserialization, do not add a ↵ | Justin Clark-Casey (justincc) | 2013-02-08 | 1 | -4/+18 | |
| | | | | | | | | | | | | | | | | | | | | | | null where the object should be. This prevents a later load IAR failure. This code is currently only used by IAR loading. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-07 | 1 | -0/+20 | |
| |\ \ \ | |/ / | ||||||
| | * | | Actually plumb the new values to physics. | Melanie | 2013-02-07 | 1 | -0/+20 | |
| | | | | ||||||
| | * | | Add some more code from Avination. This changes physics actor stuff around | Melanie | 2013-02-07 | 1 | -37/+152 | |
| | | | | | | | | | | | | | to work with the new params. Not actually plumbed just yet. | |||||
| | * | | Plumb the path from the client to the extra physics params and back | Melanie | 2013-02-07 | 2 | -2/+24 | |
| | | | | ||||||
| | * | | Revert "Add plumbing for physics properties to get to the physics engine." | Melanie | 2013-02-07 | 1 | -50/+6 | |
| | | | | | | | | | | | | | This reverts commit c658fa1c0dd83f23c66ccfedb12e8ab02ff01d0a. | |||||
| | * | | Add plumbing for physics properties to get to the physics engine. | Robert Adams | 2013-02-07 | 1 | -6/+50 | |
| | | | | | | | | | | | | | Addition of entries to PhysicsActor and setting code in SceneObjectPart. | |||||
| | * | | Rename "Bounciness" to "Restitution" | Melanie | 2013-02-07 | 2 | -6/+6 | |
| | | | | ||||||
| | * | | Partial port of Avination's support for the new physics parameters. | Melanie | 2013-02-06 | 2 | -3/+136 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Implements the parameters as properties, the serialization and database storage (MySQL only). Implements llSetPrimitiveParams for prim physics shape and the other 4 extra params. Only the prim shape type "None" is currently functional. No support for the Viewer UI (yet), that will be ported in due course. Lots more to port, this is a large-ish changeset. | |||||
| * | | | Merge branch 'avination' into careminster | Melanie | 2013-02-07 | 2 | -0/+9 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 2 | -6/+6 | |
| | | | | ||||||
| | * | | Move SoubleQueu to Util. Change HTTP inv to prioritize COF. Determine COF for SP | Melanie | 2013-02-06 | 2 | -0/+9 | |
| | | | | ||||||
| | * | | * This adds a bit more to the previous flying roll effect by adding ↵ | teravus | 2013-01-31 | 1 | -10/+50 | |
| | | | | | | | | | | | | | additional roll when pressing page down, and reducing your roll when pressing page up to make it feel more responsive and give the user more visual feedback. | |||||
| | * | | * Adds a satisfying angular roll when an avatar is flying and turning. ↵ | Melanie | 2013-01-31 | 1 | -0/+81 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | (General, not physics). Makes flying not feel as stiff. Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs | |||||
| * | | | Rename Bounciness to Restitution | Melanie | 2013-02-07 | 2 | -6/+6 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-06 | 4 | -143/+1 | |
| |\ \ \ | | |/ | |/| | ||||||
| | * | | Remove long unused Scene.DumpAssetsToFile boolean. | Justin Clark-Casey (justincc) | 2013-02-06 | 1 | -5/+0 | |
| | | | | ||||||
| | * | | Remove very long unused IScriptHost and NullScriptHost | Justin Clark-Casey (justincc) | 2013-02-06 | 3 | -138/+1 | |
| | | | | ||||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-06 | 4 | -168/+107 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs | |||||
| | * | | Remove unused ScriptEngineLoader and ScriptEngineInterface in ↵ | Justin Clark-Casey (justincc) | 2013-02-06 | 3 | -168/+0 | |
| | | | | | | | | | | | | | | | | | | | OpenSim.Region.Framework.dll I believe this predates the generic system of registering interfaces and is very long unused. | |||||
| | * | | Remove wrong code in ScriptUtils.GetAssetIdFromKeyOrItemName which would ↵ | Justin Clark-Casey (justincc) | 2013-02-06 | 1 | -15/+0 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | return the item ID instead of the asset ID if the identifier was a uuid that matched an inventory item name. This would practically never happen. This makes this overloaded version of the function consistent with the other version. It looks like this accidentally came over in commit c5af16a from Tue Oct 16 12:40:21 2012 However, there's arguably a case for looking for an item name that matches a UUID before assuming that the identifier is already an asset ID. | |||||
| | * | | refactor: Move functions that lookup asset ids from task inventory or pass ↵ | Justin Clark-Casey (justincc) | 2013-02-06 | 1 | -0/+122 | |
| | | | | | | | | | | | | | | | | | | | | | | them through to ScriptUtils class in OpenSim.Region.Framework.dll Renames functions to better reflect what they do. This is so that code registering with modInvoke() can reuse this code to provide functions that behave in a consistent manner with existing LSL/OSSL functions. | |||||
| * | | | Merge branch 'master' into careminster | Melanie | 2013-02-05 | 2 | -0/+23 | |
| |\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Data/MySQL/MySQLSimulationData.cs OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/Framework/Scenes/SceneObjectPart.cs | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |