aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-08-1113-286/+378
|\
| * Merge branch 'bulletsim7'Robert Adams2012-08-109-286/+378
| |\
| | * BulletSim: many, many detailed logging messages for physical linksetRobert Adams2012-08-107-44/+78
| | | | | | | | | | | | | | | | | | | | | | | | debugging. Linkset bugs fixed where accounting of children would get lost. Moved scene based vehicle tracking logic from prim to the scene. Added GetCollisionFlags2 method to BulletSimAPI. Updated DLLs and SOs.
| | * BulletSim: Add module names to DetailLog output. Fix some problems with ↵Robert Adams2012-08-103-63/+71
| | | | | | | | | | | | linksets that were caused by checking data structures that are changed regularly from taint time code -- resulted in linksets not being unlinked properly.
| | * BulletSim: add an identifier to the TaintObject call so exceptions that ↵Robert Adams2012-08-094-52/+57
| | | | | | | | | | | | happen when the taint is invoked can be debugged
| | * BulletSim: separate out the constraints by type. The linksets useRobert Adams2012-08-096-94/+146
| | | | | | | | | | | | | | | | | | 6dof constraint but eventually others will be exposed so future features can use all the Bullet capabilities. Force children to generate a position update when unlinked.
| | * BulletSim: add avatar code to keep avatars from ending up trapped under the ↵Robert Adams2012-08-085-54/+47
| | | | | | | | | | | | terrain
| * | BulletSim: actually update the DLLs and SOsRobert Adams2012-08-104-0/+0
| |/
* | Merge branch 'master' into careminsterMelanie2012-08-098-14/+47
|\ \ | |/
| * BulletSim: Added avatar capsule scaling for size of avatar.Robert Adams2012-08-078-14/+47
| | | | | | | | | | | | | | | | This also fixes computation of avatar mass. Added parameter MaxPersistantManifoldPoolSize. Fixed a parameter setting bug which caused crashes of there were more than 400 or so physical objects. I tested up to 5000. Updated BulletSim DLLs and SOs.
* | Merge branch 'master' into careminsterMelanie2012-08-071-0/+6
|\ \ | |/
| * Release http-in URLs when llResetScript is calledMelanie2012-08-071-0/+6
| |
* | Merge branch 'master' into careminsterMelanie2012-08-076-4/+7
|\ \ | |/
| * BulletSim: update SOs and DLLs to run on more Linux versions. Correct ↵Robert Adams2012-08-066-4/+7
| | | | | | | | multiple buoyancy settings when character flying. Remove chatty log message on prim destruction.
* | Merge branch 'master' into careminsterMelanie2012-08-0418-113/+215
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * Strip experimental tag from --publish option of "save oar" region console ↵Justin Clark-Casey (justincc)2012-08-031-8/+7
| | | | | | | | command
| * Fix old regression that stopped saving parcel owner data in OARs.Justin Clark-Casey (justincc)2012-08-033-36/+73
| | | | | | | | | | | | This was working in 0.7.2 but was accidentally removed from 0.7.3. The --publish option for "save oar" will now save oars stripped of parcel owner information as well as scene object info. Please use the --publish option if you want to publish oars that may be later loaded by others to the same grid from which they were saved.
| * Fix build break.Justin Clark-Casey (justincc)2012-08-031-1/+1
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2012-08-031-4/+4
| |\
| | * Update settings loading in AvatarFactoryModule which should have been in ↵Justin Clark-Casey (justincc)2012-08-031-4/+4
| | | | | | | | | | | | last commit 205f2326
| * | BulletSim: update DLLs and SOsRobert Adams2012-08-034-0/+0
| | |
| * | BulletSim: pass collision subscription information to the C++ code so ↵Robert Adams2012-08-033-16/+45
| | | | | | | | | | | | collisions on objects that don't care are not reported up.
| * | BulletSim: Add AddObjectForce to BulletSim API.Robert Adams2012-08-033-20/+38
| |/ | | | | | | | | | | Add interface 2 enhancements to BSCharacter. Modify AddForce and SetForce to use the new Bullet interface. More DetailLog statements for character.
| * Consolidate PersistBakedTextures, DelayBeforeAppearanceSend and ↵Justin Clark-Casey (justincc)2012-08-033-23/+23
| | | | | | | | | | | | DelayBeforeAppearanceSave into [Appearance] section from [Startup] config section so that all appearance settings are in the same place and not in the startup bucket. All these settings are in OpenSimDefaults.ini only. If you are using them then please adjust your OpenSim.ini
| * Restore SOG constructor chaining removed in recent 513b77b. This is not a ↵Justin Clark-Casey (justincc)2012-08-031-1/+1
| | | | | | | | functional change.
| * Fix the recent windows compile error by putting newFont for case "R" in ↵Justin Clark-Casey (justincc)2012-08-031-3/+8
| | | | | | | | VectorRenderModule inside its own context, rather than disposing of the old font before using it as a prototype for the new.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-031-2/+2
| |\
| | * attempting to fix a build issueSignpostMarv2012-08-031-2/+2
| | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
| * | Move previously unadvertised SendPeriodicAppearanceUpdates setting from ↵Justin Clark-Casey (justincc)2012-08-032-2/+15
| |/ | | | | | | | | | | | | | | | | | | [Startup] to [Appearance] config section. Add description and default of false (as before) to OpenSimDefaults.ini If set to true, this config switch will resend avatar appearance information (a small amount of UUID data, not the baked textures themselves) to other avatars in the sim every 60 seconds. For me, this has helped with situations where avatars appear persistently grey - the LL viewer sometimes did not appear to request assets the first time the appearance data was sent. However, this switch will not help with other appearance failure situations (e.g. failure to bake assets). This setting is experimental but will not have any significant impact on the simulator if turned to true.
* | Merge branch 'master' into careminsterMelanie2012-08-0320-299/+459
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
| * refactor: rename SOG.RezzingObjectID to SOG.FromPartID to match ↵Justin Clark-Casey (justincc)2012-08-033-3/+3
| | | | | | | | FromFolderID, FromItemID and to reflect that it's a SOP ID rather than a SOG ID.
| * Don't bothre setting RezzingObjectID to UUID.Zero in SOG constructor - this ↵Justin Clark-Casey (justincc)2012-08-031-3/+4
| | | | | | | | is already its default value as it's a struct.
| * ImprovedTerseObjectUpdate packet does not support shape updates, thus ↵SignpostMarv2012-08-031-1/+1
| | | | | | | | scheduling terse updates will not (and does not) update shape information in the viewer
| * Fixed a rare bug that caused Save OAR to fail because it thought it had ↵Oren Hurvitz2012-08-031-5/+11
| | | | | | | | | | | | timed-out The bug manifested as follows: a large world was saved. All the assets were found. But for some unknown reason, the timeout timer was restarted. So after 1 minute it closed the Archive Writer, because it didn't receive any more assets during that minute. That caused the OAR to become corrupted because ArchiveWriteRequestExecution.Save() was still running.
| * Save membership fee to the database when a group is created.Kevin Cozens2012-08-031-25/+25
| |
| * BulletSim: Debugging log statements added. Reduced size of updata buffer ↵Robert Adams2012-08-027-7/+28
| | | | | | | | trying to find a corrupted memory problem. Update DLL and SO.
| * minor: Comment out "Deleting asset" log messages for nowJustin Clark-Casey (justincc)2012-08-032-2/+4
| |
| * Delete old blank SOGSpamTestJustin Clark-Casey (justincc)2012-08-031-37/+0
| |
| * Properly dispose of all GDI+ entities used in VectorRenderModule for dynamic ↵Justin Clark-Casey (justincc)2012-08-031-253/+316
| | | | | | | | | | | | | | textures. The convention is that if an object implements IDiposable() the code must explicitly call Dispose() or call it via the using statement. This may be particularly important for GDI+ objects since they encapsulate native code entities.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-028-4/+55
| |\
| | * Initialize the Rezzing object to UUID.ZeroMelanie2012-08-021-3/+4
| | |
| | * reduced-complexity implementation of function to get rezzing object keySignpostMarv2012-08-025-1/+29
| | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * | Add simple draw test for the VectorRenderModuleJustin Clark-Casey (justincc)2012-08-022-1/+76
| | |
* | | Merge branch 'master' into careminsterMelanie2012-08-0113-26/+53
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs OpenSim/Region/Physics/Manager/PhysicsScene.cs
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-08-011-0/+3
| |\ \ | | |/
| | * Fix a bug in pCampbot grabbing behaviour where an exception would be thrown ↵Justin Clark-Casey (justincc)2012-08-011-0/+3
| | | | | | | | | | | | if the bot was not yet aware of any objects.
| * | Create the ability for physics modules to request assets on demand byMelanie2012-08-013-0/+22
| |/ | | | | | | | | | | themselves. For that, the physics module simply calls RequestAssetMethod, which in turn points to Scene.PhysicsRequestAsset. This gives physics access to the asset system without introducing unwanted knowledge of the scene class.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-08-017-12/+14
| |\
| | * BulletSim: fix problem where resizing a primary shape (cube or sphere) would ↵Robert Adams2012-07-316-5/+3
| | | | | | | | | | | | not rebuild the physics mesh. Update the DLLs and SOs to latest version.
| | * BulletSim: change boolean parameters in the shape data from int's to float's ↵Robert Adams2012-07-312-7/+11
| | | | | | | | | | | | to be consistant with parameter data structure
generated by cgit v1.1 at 2024-12-23 20:51:18 +0000