aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* add a Normalize() method for LSL_Rotationdahlia2013-06-101-0/+25
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2013-06-104-34/+51
|\
| * BulletSim: add failure flag for meshing failure vs asset fetch failureRobert Adams2013-06-104-34/+51
| | | | | | | | | | | | so error messages make more sense. Change some BulletSim status log messages from WARN to INFO. Update TODO list.
* | Fix test for adding temporary assets. Code for non-local temporary assetsMic Bowman2013-06-101-0/+20
|/ | | | is there but commented out.
* Remove Temporary from use to shortcut asset stores. The Local propertyMic Bowman2013-06-102-2/+2
| | | | | | differentiates between local & grid storage. The Temporary property just says that which service handles the it, the asset can be safely removed in the future.
* Mantis 5346: llAxisAngle2Rot() should normalize before computingTalun2013-06-101-0/+1
| | | | | | | | Corrected to agree with http://wiki.secondlife.com/wiki/Llaxisangle2rot#Deep_Notes to normalise the vector before computing the quaternion Signed-off-by: dahlia <dahlia@nomail>
* Catch exception triggered by incoming avatars using legacy profilesBlueWall2013-06-081-1/+10
|
* Merge branch 'profiles'BlueWall2013-06-072-0/+4
|\ | | | | | | message to explain why this merge is necessary,
| * SQLite support for UserProfilesBlueWall2013-06-071-0/+1
| |
| * Ensure selected module is the only active oneBlueWall2013-06-071-0/+3
| |
* | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-072-1/+30
|\ \
| * \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-074-6/+11
| |\ \
| | * | minor: Comment out debug logging (at warn level) about number of objects ↵Justin Clark-Casey (justincc)2013-06-071-1/+1
| | |/ | | | | | | | | | force selected and turn down to debug level
| * | Put the configuration back in FetchInventoryDesc2 cap.Diva Canto2013-06-071-0/+29
| | |
* | | Supply proper type information for the various types of requestsMelanie2013-06-072-6/+7
| | |
* | | Adding Avination's PollService to round out the HTTP inventory changesMelanie2013-06-073-8/+8
| |/ |/|
* | Fix regression where multiple close agents could be sent to the wrong ↵Justin Clark-Casey (justincc)2013-06-071-1/+6
| | | | | | | | | | | | | | | | neighbour region on root agent close. This was introduced in git master d214e2d0 (Thu May 16 17:12:02 2013) Caught out by the fact that value types used in iterators act like references and this was dispatched asynchronously. Should address http://opensimulator.org/mantis/view.php?id=6658
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-071-3/+26
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-061-0/+5
| |\
| * | Fix keyframe motion copyrightMelanie2013-06-061-3/+26
| | |
* | | In LocalFriendshipTerminated, send the original client's agentId to the ↵Donnie Roberts2013-06-072-4/+4
| |/ |/| | | | | friend being removed instead of the friend's own id.
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-06-0511-0/+229
|\ \ | |/
| * Hook up Keyframe motion to almost everything. Failing to cross a sim borderMelanie2013-06-0611-0/+229
| | | | | | | | may yield unexpected results in some cases. No database persistence yet,
* | Strengthen some assumptions.Diva Canto2013-06-051-0/+5
|/
* Committing Avination's Keyframe module. This is not hooked up yet and will ↵Melanie2013-06-061-0/+766
| | | | do nothing. More commits to follow.
* Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2013-06-052-63/+234
|\
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-06-054-37/+84
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-06-051-14/+16
| | |\
| | * | Avoid a deadlock where a script can attempt to take a ↵Justin Clark-Casey (justincc)2013-06-051-11/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ScriptInstance.m_Scripts lock then a lock on SP.m_attachments whilst SP.MakeRootAgent() attempts to take in the opposite order. This is because scripts (at least on XEngine) start unsuspended - deceptively the ResumeScripts() calls in various places in the code are actually completely redundant (and useless). The solution chosen here is to use a copy of the SP attachments and not have the list locked whilst creating the scripts when an avatar enters the region. This looks to address http://opensimulator.org/mantis/view.php?id=6557
| * | | Port Avination's inventory send throttlingMelanie2013-06-051-52/+213
| | | |
* | | | Prevent processing for NpcBlueWall2013-06-051-1/+3
| |_|/ |/| |
* | | Remove a couple of orphaned linesBlueWall2013-06-051-3/+0
| | |
* | | Make locking more uniformBlueWall2013-06-051-14/+19
| |/ |/|
* | BulletSim: default PhysicsTimeStep to same as the simulator'sRobert Adams2013-06-051-1/+1
| | | | | | | | | | | | heartbeat timestep when running the physics engine on a separate thread. This reduces the occurance of heartbeats that happen when there is no physics step which is seen as vehicle jerkyness.
* | BulletSim: fix corner case when rebuilding a compound linkset whileRobert Adams2013-06-051-11/+46
|/ | | | | | a mesh/hull while a mesh or hull is being rebuilt when its asset is fetched. This fixes a 'pure virtual function' crash when changing physical state of complex linksets that include many meshes.
* BulletSim: experimental movement of physics execution off of heartbeatRobert Adams2013-06-013-73/+209
| | | | | | | | | | thread. Off by default until more testing. Setting "[BulletSim]UseSeparatePhysicsThread=true" causes the physics engine to be called on its own thread and the heartbeat thread only handles the reporting of property updates and collisions. Physics frame rate is about right but physics execution time goes to zero as accounted by the heartbeat loop.
* Adding back the BasicProfileModuleBlueWall2013-05-312-73/+191
|
* Remove unnecessary m_scenes and m_scene from AsyncCommandManager.Justin Clark-Casey (justincc)2013-05-311-6/+1
| | | | These were private and the sole point of use (to know when to load config for the first time) can be done by looking at script engines instead.
* Lock areas of AsyncCommandManager where multiple threads could try to ↵Justin Clark-Casey (justincc)2013-05-311-111/+177
| | | | | | | | access/update the same static structures simultaneously. This is possible where there is more than one scene (multiple copies of the same script engine) and/or more than one script engine being used. These operations are not thread safe and could be leading to the exceptions/problems seen in http://opensimulator.org/mantis/view.php?id=6651 This also prevents a small race condition where more than one AsyncLSLCmdHandlerThread could be started.
* refactor: Remove unused AsyncCommandManager.PleaseShutdownJustin Clark-Casey (justincc)2013-05-311-19/+1
|
* Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-05-304-176/+1613
|\
| * Merge branch 'work' contains UserProfiles with Robust service and updates ↵BlueWall2013-05-304-176/+1613
| |\ | | | | | | | | | region module using JsonRpc messaging. Requres no databse changes (but backup existing data before use).
| | * UserProfilesBlueWall2013-05-304-176/+1613
| | | | | | | | | | | | UserProfiles for Robust and Standalone. Includes service and connectors for Robust and standalone opensim plus matching region module.
* | | Trigger OnScenePresenceUpdated when the avatar's animations change.Robert Adams2013-05-302-4/+21
| | |
* | | Add methods to Animation and AnimationSet for easier manipulation andRobert Adams2013-05-302-0/+136
| | | | | | | | | | | | | | | display of groups of animations (Equal(), ToString(), FromOSDArray(), ...). No functional change to animations.
* | | Add region heartbeat start event to complement heartbeat end event.Robert Adams2013-05-302-0/+25
|/ / | | | | | | This allows object modification before the usual heartbeat operation.
* | If an exception occurs in the AsyncCommandManager loop, spit it out to log ↵Justin Clark-Casey (justincc)2013-05-301-8/+6
|/ | | | | | rather than silently swallowing it. This might help diagnose the cause of http://opensimulator.org/mantis/view.php?id=6651 where sometimes scripts fail to start on region start.
* minor: fix warnings in GodsModule that were due to duplicate using statementsJustin Clark-Casey (justincc)2013-05-301-11/+7
|
* Fix passing of voice distance attenuation to the Vivox voice server.Justin Clark-Casey (justincc)2013-05-301-1/+1
| | | | | Because of a typo, this wasn't being done at all - now the 'default' value as described in OpenSimDefaults.ini of 10m is passed (vivox_channel_clamping_distance) Thanks to Ai Austin for spotting this.
* If on a sit request we sit the avatar on a different prim in a linkset for ↵Justin Clark-Casey (justincc)2013-05-301-3/+3
| | | | | | | | | some reason (e.g. because it has a sit target), then send the actual sit prim UUID to the viewer rather than the requested one. This purports to fix the issue described in http://opensimulator.org/mantis/view.php?id=6653 where the camera can end up following the requested sit prim rather than the actual. The original spot was by Vegaslon, this commit just goes about it in a slightly different way This commit also makes m_requestedSitTargetUUID to be the actual UUID, which is consistent with m_requestedSitTargetID which was already doing this. However, this adjustment has no practical effect since we only currently need to know that there's any requested sit UUID at all, not which one it is.