aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-03-190-0/+0
|\
| * Process default attachment point in AttachObjectInternal before we check ↵Justin Clark-Casey (justincc)2013-03-191-27/+27
| | | | | | | | whether a worn object needs to displace an existing attachment on the same point if we are not using multi-attach.
| * Fix tests for multiattachMelanie2013-03-182-6/+6
| |
| * Merge branch 'master' into newmultiattachMelanie2013-03-1888-9613/+2109
| |\ | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * \ Merge commit 'ccd6f443e1092cb410f565e921f7cf4dd8cd2dac' into newmultiattachMelanie2013-03-181-139/+167
| |\ \ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | | Limit each attachment point to 5 items as per specMelanie2013-03-181-3/+13
| | | |
| * | | Multiattach, part 2Melanie2013-03-181-3/+9
| | | |
| * | | Multiattach, part 1Melanie2013-03-187-39/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/AvatarAppearance.cs OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
* | | | Merge commit '3611d33b00650ccc71994b331e4c6595f95d3131' into careminsterMelanie2013-03-192-143/+351
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
| * | | Improve rejection of any attempt to reattach an object that is already attached.Justin Clark-Casey (justincc)2013-03-182-31/+194
| | | | | | | | | | | | | | | | This also adds/extends regression tests for wearing attachments directly for the scene and attempting to reattach/rewear already attached objects.
| * | | Fix recent regression where an item worn to an attachment point that was ↵Justin Clark-Casey (justincc)2013-03-182-89/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | already occupied did not remove the previous attachment (current behaviour) Regression was commit ccd6f4 (Tue Mar 5 23:47:36 2013) Added regression test for this case.
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-03-1729-8909/+157
| |\ \ \
| * | | | Make the LSL memory functions virtual so script engines can override them if ↵Melanie2013-03-151-3/+3
| | | | | | | | | | | | | | | | | | | | they have different memory management.
* | | | | Merge commit '464201b41d5f5fdd7c88ab5e95dd7b6fbae6d766' into careminsterMelanie2013-03-1929-8909/+157
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | BulletSim: add INI parameter for angular banking timescale fudge parameter.Robert Adams2013-03-162-7/+12
| | | | |
| * | | | BulletSim: Working Implementation of Angular Banking for Vehicles (Not SL ↵Vegaslon2013-03-161-16/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Grade, Other features when implemented should slow it down for now be Strong with Vertical Angular attraction setting and conservative with Angular Velocity on X axis) Signed-off-by: Robert Adams <Robert.Adams@intel.com>
| * | | | *Yet another HTTPServer update code changes in OpenSim Libs. * This fixes a ↵teravus2013-03-164-3/+135
| | | | | | | | | | | | | | | | | | | | connection close issue by getting rid of the socket references * This adds a connection timeout checker to shutdown poor or evil connections and combats DOS attempts that just connect and make no complete requests and just wait. It also actually implements KeepAlive... instead of just understanding the connection header in the request... you can test by connecting and requesting a keepalive header and sending another request on the same connection. The new timeout checker closes expired keepalive sessions, just make sure you send the request within 70 seconds of connecting or the timeout checker will timeout the connection.
| * | | | Finally remove the 'REST' ApplicationPlugins code which has been ↵Justin Clark-Casey (justincc)2013-03-1523-8890/+0
| |/ / / | | | | | | | | | | | | non-functional and largely commented out for many years.
* | | | Merge branch 'master' into careminsterMelanie2013-03-1525-339/+474
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/BaseOpenSimServer.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | Change the table and field names of XAssetService mysql db tables to be ↵Justin Clark-Casey (justincc)2013-03-152-62/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | capitalized like Avatars, Friends, etc. Also fixes access time being set on assets rather than XAssetsMeta This is to try and be somewhat consistent with other service tables that are mainly in this style. No migration is supplied, since nobody should be using this service yet except on a test basis.
| * | | Implement access time updates on assets for XAssetService.Justin Clark-Casey (justincc)2013-03-151-38/+57
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This only happens if access time is older than 30 days currently, in order to reduce database updates. The idea is to give some idea of assets which haven't been accessed for a very, very long time. These might conceivably be deleteable, though this will be a risk due to caching at other points in the chain. This is actually currently much less useable on the xasset service since access time is on metadata rather than the data itself. And many metadata entries may point to the same data. Probably need to address this.
| * | | refactor: Reuse Get() method in AssetService to eliminate some copy/paste in ↵Justin Clark-Casey (justincc)2013-03-151-23/+5
| | | | | | | | | | | | | | | | other Get methods
| * | | Migrate assets from chained asset service to xassetservice as they are ↵Justin Clark-Casey (justincc)2013-03-151-28/+20
| | | | | | | | | | | | | | | | | | | | | | | | requested. This shrinks the asset database over time as duplicate assets are fetched.
| * | | Fix bug in AssetService where requesting data only for an asset would throw ↵Justin Clark-Casey (justincc)2013-03-151-1/+5
| | | | | | | | | | | | | | | | an exception if the asset did not exist.
| * | | minor: log an error rather than info if a connector fails to load.Justin Clark-Casey (justincc)2013-03-151-1/+1
| | | |
| * | | minor: Make logged message in ServerUtils more consistent.Justin Clark-Casey (justincc)2013-03-151-10/+10
| | | |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-154-35/+60
| |\ \ \
| | * | | Add Vegaslon to CONTRIBUTORS.txtRobert Adams2013-03-151-0/+1
| | | | |
| | * | | BulletSim: Tweak vertical angular attraction to remove double ↵Vegaslon2013-03-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | VehicleOrientation application fixing the problem with the vertical attractor pushing vehicles nose first into ground when tilted on side. Signed-off-by: Robert Adams <Robert.Adams@intel.com>
| | * | | Fix server statistics always reporting zero for total network bytes in/out.Robert Adams2013-03-152-34/+58
| | | | | | | | | | | | | | | | | | | | Clean up some parameter code in Statistics.Binary.
| * | | | Make it possible to chain another asset service underneath the ↵Justin Clark-Casey (justincc)2013-03-153-23/+76
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | de-duplicating XAssetService. This makes it possible to use the dedupliicating service without needing to migrate all the existing asset data beforehand. Currently controlled by a ChainedServiceModule setting in [AssetService] (e.g. ChainedServiceModule = "OpenSim.Services.AssetService.dll:AssetService") Not yet ready for use.
| * | | Add example code to DOExampleModule to pull data from that previously saved ↵Justin Clark-Casey (justincc)2013-03-152-5/+29
| | | | | | | | | | | | | | | | by DAExampleModule when instantiating a dynamc object.
| * | | Add ParentGroup.HasGroupChanged = true setting to DAExampleModule as this is ↵Justin Clark-Casey (justincc)2013-03-151-0/+2
| | | | | | | | | | | | | | | | necessary to get attributes to save (though this probably happens anyway due to the prim move)
| * | | refactor: make llGetLinkName() and llGetLinkKey() use a common ↵Justin Clark-Casey (justincc)2013-03-151-84/+80
| | | | | | | | | | | | | | | | GetLinkEntity() method
| * | | minor: remove mono compiler warnings in LSL_Api.csJustin Clark-Casey (justincc)2013-03-141-3/+3
| | | |
| * | | Log same environment information to Robust log as is already done for ↵Justin Clark-Casey (justincc)2013-03-145-19/+23
| | | | | | | | | | | | | | | | simulator logs, for debug purposes
| * | | refactor: minor cleanup in osGetAvatarList()Justin Clark-Casey (justincc)2013-03-141-2/+1
| | | |
| * | | Fix bug in osCauseHealing() if called with an avatar ID for an avatar that ↵Justin Clark-Casey (justincc)2013-03-141-13/+9
| | | | | | | | | | | | | | | | is not in the scene.
| * | | minor: Use more compact libomv primitive constructors in osNpcGetPos() and ↵Justin Clark-Casey (justincc)2013-03-141-6/+3
| | | | | | | | | | | | | | | | osNpcGetRot()
| * | | Fix minor race conditions in OSSL_Api functions where a parcel could be ↵Justin Clark-Casey (justincc)2013-03-141-6/+4
| | | | | | | | | | | | | | | | misidentified for moving prims.
| * | | refactor: Use LSL_Vector(Vector3) constructor in llCastRay()Justin Clark-Casey (justincc)2013-03-141-1/+1
| | | |
| * | | refactor: Use ILandChannel.GetLandObject(Vector3) in LSL_Api rather than ↵Justin Clark-Casey (justincc)2013-03-141-41/+21
| | | | | | | | | | | | | | | | having to continually take intermediate Vector3s to avoid race conditions
| * | | Add ILandChannel.GetLandObject(Vector3 position) as this is a very common ↵Justin Clark-Casey (justincc)2013-03-144-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | input to GetLandObject() This conforms to the existing ILandChannel.ParcelsNearPoint() method
| * | | Fix minor race condition in llGetCameraRot() where inconsistent information ↵Justin Clark-Casey (justincc)2013-03-141-4/+4
| | | | | | | | | | | | | | | | could be returned for a rotating camera
| * | | Fix minor race condition in llGetCameraPos() where an inconsistent post ↵Justin Clark-Casey (justincc)2013-03-141-4/+5
| | | | | | | | | | | | | | | | could be returned for a moving camera
| * | | Fix minor race condition in llParcelMediaCommandList() where a parcel could ↵Justin Clark-Casey (justincc)2013-03-141-1/+3
| | | | | | | | | | | | | | | | be misidentified for a moving prim
| * | | Fix minor race conditions in LSL_Api.GetPrimParams() for PRIM_POSITION, ↵Justin Clark-Casey (justincc)2013-03-141-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | PRIM_SIZE and PRIM_ROT_LOCAL This function is used by all the various ll*Params() and os*Params() functions
| * | | Fix minor race condition in llGetGeometricCenter() if this was changing ↵Justin Clark-Casey (justincc)2013-03-141-1/+1
| | | | | | | | | | | | | | | | whilst the function was called.
* | | | Merge branch 'master' into careminsterMelanie2013-03-1413-60/+353
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/ScenePresence.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
| * | | refactor: use LSL_Rotation(Quaternion) constructor in lLGetRootRotation()Justin Clark-Casey (justincc)2013-03-141-1/+2
| | | |
generated by cgit v1.1 at 2024-12-23 13:03:14 +0000