| Commit message (Collapse) | Author | Age | Files | Lines | ||
|---|---|---|---|---|---|---|
| ... | ||||||
| | | * | | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 1 | -8/+36 | |
| | | |\ \ | | | |/ | | | | | | | | | | | | | Conflicts: OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs | |||||
| | | | * | Perform ownership transfer and permission propagation as well as needed | Melanie | 2012-08-14 | 1 | -0/+28 | |
| | | | | | | | | | | | | | | | | | updates on the new temp attachment. | |||||
| | | | * | Move inititalization to RegionLoaded to avoid a module loading order issue | Melanie | 2012-08-14 | 1 | -8/+8 | |
| | | | | | ||||||
| * | | | | Removed more spammy NPC crap | Melanie | 2012-08-14 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | Comment spammy debug | Melanie | 2012-08-14 | 1 | -3/+3 | |
| | | | | ||||||
| * | | | Merge branch 'careminster' into avination | Melanie | 2012-08-14 | 29 | -431/+871 | |
| |\ \ \ | |/ / | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/VectorRender/VectorRenderModule.cs | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-08-14 | 7 | -20/+168 | |
| | |\ \ | | |/ | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | | * | Implement the temp attachments. UNTESTED | Melanie | 2012-08-14 | 1 | -0/+44 | |
| | | | | ||||||
| | | * | As per lindn spec, disable detach and drop for temp attachments | Melanie | 2012-08-14 | 1 | -0/+8 | |
| | | | | ||||||
| | | * | Add the skeleton for the temp attachments module | Melanie | 2012-08-14 | 1 | -0/+82 | |
| | | | | ||||||
| | | * | Exclude temp attachemnts from being sent to the avatar service | Melanie | 2012-08-14 | 1 | -1/+2 | |
| | | | | ||||||
| | | * | Lay some groundwork for temp attachments. Decouple attachments from inventory. | Melanie | 2012-08-14 | 5 | -20/+33 | |
| | | | | ||||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-08-13 | 1 | -6/+68 | |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | |||||
| | | * | attempt at replicating behaviour of llList2thing functions in SL | SignpostMarv | 2012-08-13 | 1 | -7/+69 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | Committed with changes. Please don't sign comments with your name. Please don't use your own coding style, use the OpenSim project style. Please don't modify unrelated whitespace. Signed-off-by: Melanie <melanie@t-data.com> | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-08-11 | 13 | -286/+378 | |
| | |\ \ | | |/ | ||||||
| | | * | Merge branch 'bulletsim7' | Robert Adams | 2012-08-10 | 9 | -286/+378 | |
| | | |\ | ||||||
| | | | * | BulletSim: many, many detailed logging messages for physical linkset | Robert Adams | 2012-08-10 | 7 | -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 Adams | 2012-08-10 | 3 | -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 Adams | 2012-08-09 | 4 | -52/+57 | |
| | | | | | | | | | | | | | | | | | happen when the taint is invoked can be debugged | |||||
| | | | * | BulletSim: separate out the constraints by type. The linksets use | Robert Adams | 2012-08-09 | 6 | -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 Adams | 2012-08-08 | 5 | -54/+47 | |
| | | | | | | | | | | | | | | | | | terrain | |||||
| | | * | | BulletSim: actually update the DLLs and SOs | Robert Adams | 2012-08-10 | 4 | -0/+0 | |
| | | |/ | ||||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-08-09 | 8 | -14/+47 | |
| | |\ \ | | |/ | ||||||
| | | * | BulletSim: Added avatar capsule scaling for size of avatar. | Robert Adams | 2012-08-07 | 8 | -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 careminster | Melanie | 2012-08-07 | 1 | -0/+6 | |
| | |\ \ | | |/ | ||||||
| | | * | Release http-in URLs when llResetScript is called | Melanie | 2012-08-07 | 1 | -0/+6 | |
| | | | | ||||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-08-07 | 6 | -4/+7 | |
| | |\ \ | | |/ | ||||||
| | | * | BulletSim: update SOs and DLLs to run on more Linux versions. Correct ↵ | Robert Adams | 2012-08-06 | 6 | -4/+7 | |
| | | | | | | | | | | | | | multiple buoyancy settings when character flying. Remove chatty log message on prim destruction. | |||||
| | * | | Merge branch 'master' into careminster | Melanie | 2012-08-04 | 18 | -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-03 | 1 | -8/+7 | |
| | | | | | | | | | | | | | command | |||||
| | | * | Fix old regression that stopped saving parcel owner data in OARs. | Justin Clark-Casey (justincc) | 2012-08-03 | 3 | -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-03 | 1 | -1/+1 | |
| | | | | ||||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Robert Adams | 2012-08-03 | 1 | -4/+4 | |
| | | |\ | ||||||
| | | | * | Update settings loading in AvatarFactoryModule which should have been in ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -4/+4 | |
| | | | | | | | | | | | | | | | | | last commit 205f2326 | |||||
| | | * | | BulletSim: update DLLs and SOs | Robert Adams | 2012-08-03 | 4 | -0/+0 | |
| | | | | | ||||||
| | | * | | BulletSim: pass collision subscription information to the C++ code so ↵ | Robert Adams | 2012-08-03 | 3 | -16/+45 | |
| | | | | | | | | | | | | | | | | | collisions on objects that don't care are not reported up. | |||||
| | | * | | BulletSim: Add AddObjectForce to BulletSim API. | Robert Adams | 2012-08-03 | 3 | -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-03 | 3 | -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-03 | 1 | -1/+1 | |
| | | | | | | | | | | | | | functional change. | |||||
| | | * | Fix the recent windows compile error by putting newFont for case "R" in ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -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/opensim | Justin Clark-Casey (justincc) | 2012-08-03 | 1 | -2/+2 | |
| | | |\ | ||||||
| | | | * | attempting to fix a build issue | SignpostMarv | 2012-08-03 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | Signed-off-by: BlueWall <jamesh@bluewallgroup.com> | |||||
| | | * | | Move previously unadvertised SendPeriodicAppearanceUpdates setting from ↵ | Justin Clark-Casey (justincc) | 2012-08-03 | 2 | -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 'avination' into ubitwork | UbitUmarov | 2012-08-07 | 1 | -0/+6 | |
| |\ \ \ | ||||||
| | * \ \ | Merge branch 'avination' of ssh://melanie@3dhosting.de/var/git/careminster ↵ | Melanie | 2012-08-07 | 1 | -0/+7 | |
| | |\ \ \ | | | | | | | | | | | | | | | | into avination | |||||
| | * | | | | Release http-in URLs when llResetScript is called | Melanie | 2012-08-07 | 1 | -0/+6 | |
| | | | | | | ||||||
| * | | | | | use a bit more complex mesh key identifier, plus a bug fix | UbitUmarov | 2012-08-07 | 3 | -29/+96 | |
| | | | | | | ||||||
| * | | | | | *** TESTTTTT ** downgrade from .net 4.0 to .net3.5 | UbitUmarov | 2012-08-06 | 1 | -97/+97 | |
| | | | | | | ||||||
| * | | | | | ** DANGER someone should stress test more ** release unused physics meshs, ↵ | UbitUmarov | 2012-08-06 | 7 | -55/+174 | |
| | | | | | | | | | | | | | | | | | | | | | including unmanaged memory allocations (allocated by managed code) | |||||
| * | | | | | bug fix: keep sculpt bitmaps border pixels during resolution scaling. | UbitUmarov | 2012-08-05 | 3 | -15/+78 | |
| | | | | | | | | | | | | | | | | | | | | | let this eventually have diferent interpolator last steps on each direction as sl seems to do. | |||||
 |
index : opensim-SC | |
| My fork of OpenSim for IG and DG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |