Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2013-03-15 | 25 | -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-15 | 2 | -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-15 | 1 | -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-15 | 1 | -23/+5 |
| | | | | | | | | other Get methods | ||||
| * | Migrate assets from chained asset service to xassetservice as they are ↵ | Justin Clark-Casey (justincc) | 2013-03-15 | 1 | -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-15 | 1 | -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-15 | 1 | -1/+1 |
| | | |||||
| * | minor: Make logged message in ServerUtils more consistent. | Justin Clark-Casey (justincc) | 2013-03-15 | 1 | -10/+10 |
| | | |||||
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2013-03-15 | 4 | -35/+60 |
| |\ | |||||
| | * | Add Vegaslon to CONTRIBUTORS.txt | Robert Adams | 2013-03-15 | 1 | -0/+1 |
| | | | |||||
| | * | BulletSim: Tweak vertical angular attraction to remove double ↵ | Vegaslon | 2013-03-15 | 1 | -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 Adams | 2013-03-15 | 2 | -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-15 | 3 | -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-15 | 2 | -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-15 | 1 | -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-15 | 1 | -84/+80 |
| | | | | | | | | GetLinkEntity() method | ||||
| * | minor: remove mono compiler warnings in LSL_Api.cs | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -3/+3 |
| | | |||||
| * | Log same environment information to Robust log as is already done for ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 5 | -19/+23 |
| | | | | | | | | simulator logs, for debug purposes | ||||
| * | refactor: minor cleanup in osGetAvatarList() | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -2/+1 |
| | | |||||
| * | Fix bug in osCauseHealing() if called with an avatar ID for an avatar that ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -13/+9 |
| | | | | | | | | is not in the scene. | ||||
| * | minor: Use more compact libomv primitive constructors in osNpcGetPos() and ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -6/+3 |
| | | | | | | | | osNpcGetRot() | ||||
| * | Fix minor race conditions in OSSL_Api functions where a parcel could be ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -6/+4 |
| | | | | | | | | misidentified for moving prims. | ||||
| * | refactor: Use LSL_Vector(Vector3) constructor in llCastRay() | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -1/+1 |
| | | |||||
| * | refactor: Use ILandChannel.GetLandObject(Vector3) in LSL_Api rather than ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -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-14 | 4 | -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-14 | 1 | -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-14 | 1 | -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-14 | 1 | -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-14 | 1 | -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-14 | 1 | -1/+1 |
| | | | | | | | | whilst the function was called. | ||||
* | | Merge branch 'master' into careminster | Melanie | 2013-03-14 | 13 | -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-14 | 1 | -1/+2 |
| | | |||||
| * | Fix minor race condition in llGetRootPosition() where inconsistent results ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -2/+2 |
| | | | | | | | | could be returned for moving prims | ||||
| * | Fix minor race conditions in detecting current parcel for ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -3/+7 |
| | | | | | | | | llAddToLandPassList(), llSetParcelMusicURL() and llGetParcelMusicURL() for moving prims | ||||
| * | refactor: use LSL_Vector(Vector3) constructor in llGroundNormal() | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -1/+1 |
| | | |||||
| * | minor: Reuse ground LSL_Vector in llGroundSlope() rather than creating a new ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -1/+6 |
| | | | | | | | | one. | ||||
| * | Fix minor race conditions in llTeleportAgent(), ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -14/+21 |
| | | | | | | | | llTeleportAgentGlobalCoords(), llEjectFromLand() and llOverMyLand() where the wrong parcel could be identified for very fast moving avatars. | ||||
| * | refactor: Use LSL_Vector(Vector3) constructor in llGetCenterOfMass() | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -2/+2 |
| | | |||||
| * | Fix a minor race condition in llInstantMessage() where slightly wrong origin ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -3/+5 |
| | | | | | | | | co-ordinates could be given for a fast moving prim | ||||
| * | Fix minor race condition in llGetOmega() where inconsistent results could be ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -1/+2 |
| | | | | | | | | | | | | returned (accidentally stated that commit 1774c631 was this fix). Commit 1774c631 was actually a fix for a similar minor race condition in llGetAccel() | ||||
| * | Fix minor race condition in llGetOmega() where a call whilst a prim was ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -1/+2 |
| | | | | | | | | changing angular velocity could return inconsistent results | ||||
| * | refactor: Use LSL_Vector(Vector3) constructor in llGetVel() | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -1/+1 |
| | | |||||
| * | refactor: Use LSL_Vector(Vector3) constructor in llGetTorque() | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -2/+2 |
| | | |||||
| * | Fix minor race condition in llGetLocalRot() where inconsistent results could ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -1/+2 |
| | | | | | | | | be returned if the prim was rotating during the call | ||||
| * | refactor: use cleaner LSL_Rotation quaternion constructor in ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 1 | -3/+4 |
| | | | | | | | | LSL_Api.GetPartRot() | ||||
| * | Fix sensors, llGetRootRotation(), llGet*Param() and other functions to use ↵ | Justin Clark-Casey (justincc) | 2013-03-14 | 3 | -10/+7 |
| | | | | | | | | the world rotation if the avatar to which they are attached is sitting | ||||
| * | Make llGetObjectDetails() return the correct world rotation for a sitting avatar | Justin Clark-Casey (justincc) | 2013-03-14 | 2 | -6/+36 |
| | | | | | | | | | | | | This addresses http://opensimulator.org/mantis/view.php?id=6567 This creates a ScenePresence.GetWorldRotation() with the same semantics as SOP.GetWorldRotation() SP.Rotation can't be used since it's relative to the sat upon prim if the avatar is sitting. | ||||
| * | Merge branch 'master' of ssh://opensim/var/git/opensim | teravus | 2013-03-14 | 14 | -50/+450 |
| |\ | |||||
| | * | Improve DAExampleModule to show current necessary locking to avoid race ↵ | Justin Clark-Casey (justincc) | 2013-03-13 | 1 | -8/+16 |
| | | | | | | | | | | | | conditions with a serialization thread. | ||||
| | * | Remove unnecessary instation of DOMap() in SOP from commit 5c53660 since ↵ | Justin Clark-Casey (justincc) | 2013-03-13 | 1 | -1/+0 |
| | | | | | | | | | | | | this is being done lazily |