aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'e449950030decf7e65e7d9b334ddaed25c1bd629' into careminsterMelanie2013-06-064-31/+65
|\
| * Prevent processing for NpcBlueWall2013-06-051-1/+3
| |
| * CleanupBlueWall2013-06-051-5/+0
| |
| * 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.
* | Merge branch 'master' into careminsterMelanie2013-06-0425-228/+4443
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/AsyncCommandManager.cs
| * 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 standard OpenSim header to source filesBlueWall2013-05-318-0/+216
| |
| * 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
| |
| * Fill in fields with default values on profile creationBlueWall2013-05-311-2/+48
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-05-3013-176/+3631
| |\
| | * Merge branch 'work' contains UserProfiles with Robust service and updates ↵BlueWall2013-05-3013-176/+3631
| | |\ | | | | | | | | | | | | region module using JsonRpc messaging. Requres no databse changes (but backup existing data before use).
| | | * UserProfilesBlueWall2013-05-3013-176/+3631
| | | | | | | | | | | | | | | | 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-303-0/+156
| | | | | | | | | | | | | | | | | | | | 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.
* | Merge branch 'master' into careminsterMelanie2013-05-3016-64/+149
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
| * Try caching the user name for a new agent earlier on in the process of ↵Justin Clark-Casey (justincc)2013-05-293-5/+11
| | | | | | | | | | | | | | | | | | | | establishing a connection, to see if this helps with "Unknown UserUMMTGUN" issues. The UMMTGUN form of Unknown User seems to appear because a viewer sometimes sends a UUIDNameRequest UDP request that fails to find a binding. However, in theory the incoming agent should have made that binding before any such request is triggered. So moving this binding to an earlier point in the process to see if this makes a difference. Unknown user name is also updated to UserUMMTGUN2 - if you see the old name then you need to clear your viewer cache. This relates to http://opensimulator.org/mantis/view.php?id=6625
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-05-292-14/+27
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-2834-334/+819
| | |\
| | * | First change in Vivox for ages! -- added a lock to serialize calls to vivox ↵Diva Canto2013-05-281-14/+25
| | | | | | | | | | | | | | | | servers. This may ameliorate things when lots of avies arrive in a sim at about the same time. Turns out that there are 4 http requests per avie to Vivox.
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-05-2011-81/+159
| | |\ \
| | * | | Add commentDiva Canto2013-05-201-0/+2
| | | | |
| * | | | Add HG regression TestCachedUserNameForNewAgent()Justin Clark-Casey (justincc)2013-05-291-0/+76
| | |_|/ | |/| |
| * | | BulletSim: don't zero motion when changing vehicle type.Robert Adams2013-05-281-1/+4
| | | | | | | | | | | | | | | | | | | | Some vehicle scripts change type on the fly as an easy way of setting all the parameters (like a plane changing to a car when on the ground).
| * | | BulletSim: default using mesh asset hulls to 'true'. This means that,Robert Adams2013-05-271-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | if the mesh asset specifies physics hulls, BulletSim will fetch and use same rather than approximating the hulls. If physics hulls are not specified, the representation will fall back to the regular physics mesh.
| * | | BulletSim: enable GImpact shape for prims with cuts. Include DLLs and SOsRobert Adams2013-05-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | which recompute GImpact shape bounding box after creation as Bullet doesn't do that itself (something it does for nearly every other shape). Now, physical prims without cuts become single mesh convex meshes. Physical prims with cuts become GImpact meshes. Meshes become a set of convex hulls approximated from the mesh unless the hulls are specified in the mesh asset data. The use of GImpact shapes should make some mechanical physics more stable.
| * | | Update the money framework to allow sending the new style linden "serverside ↵Melanie2013-05-259-44/+32
| | | | | | | | | | | | | | | | | | | | | | | | is now viewerside" messages regarding currency This will require all money modules to be refactored!
* | | | Merge branch 'master' into careminsterMelanie2013-05-254-5/+16
|\ \ \ \ | |/ / /
| * | | Meshmerizer: remember to add the copied hull verts to the list of hulls.Robert Adams2013-05-241-0/+1
| | | |
| * | | BulletSim: add VehicleInertiaFactor to allow modifying inertia.Robert Adams2013-05-242-1/+5
| | | | | | | | | | | | | | | | | | | | Another parameter for vehicle operation tuning. Default to <1,1,1> which means nothing is different under normal use.
| * | | BulletSim: properly set mesh hash key in use tracking structure.Robert Adams2013-05-241-1/+4
| | | | | | | | | | | | | | | | Shouldn't see any functional difference.
| * | | Meshmerizer: add INI parameter to enable DEBUG mesh detail logging.Robert Adams2013-05-241-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Default to off. To turn mesh parsing DEBUG detail logging on, add [Mesh] LogMeshDetail=true to the INI file.
| * | | One more appearance change: drop sending the SendAppearance packetMic Bowman2013-05-241-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | to avatar when it becomes root. This packet shows up in the viewer logs as an error and appears to cause problems for completing the texture rebake process for v1 viewers in some cases.
| * | | Protect one more update of the baked texture hashes.Mic Bowman2013-05-241-2/+5
| | | |
| * | | This is an experimental patch that adds support for comparing textureMic Bowman2013-05-245-84/+147
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | hashes for the purpose of accurately responding to AgentTextureCached packets. There is a change to IClientAPI to report the wearbles hashes that come in through the SetAppearance packet. Added storage of the texture hashes in the appearance. While these are added to the Pack/Unpack (with support for missing values) routines (which means Simian will store them properly), they are not currently persisted in Robust.
* | | | Merge commit '440905ad14d4261df9da0fd2ce7e20a350982af1' into careminsterMelanie2013-05-251-53/+83
|\ \ \ \ | |/ / /
| * | | change a hull debugging message to Debug instead of Infodahlia2013-05-241-1/+1
| | | |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimdahlia2013-05-242-1/+2
| |\ \ \
| * | | | correct some errors in decoding of mesh asset convex decomposition datadahlia2013-05-241-53/+83
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2013-05-246-156/+244
|\ \ \ \ \ | | |/ / / | |/| | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPart.cs OpenSim/Region/Physics/BulletSPlugin/BSShapes.cs
generated by cgit v1.1 at 2024-11-18 22:14:21 +0000