| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminster | Melanie | 2012-03-22 | 1 | -7/+10 |
| |\ | |||||
| | * | HG Friends: don't notify if the server isn't there. | Diva Canto | 2012-03-22 | 1 | -7/+10 |
| | | | |||||
| | * | Change a false false to be truly true - or is this statement false? | Melanie | 2012-03-22 | 1 | -1/+1 |
| | | | | | | | | | Fixes perms boo-boo | ||||
| * | | Fix merge issue from core | Melanie | 2012-03-22 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'master' into careminster | Melanie | 2012-03-22 | 17 | -206/+340 |
| |\ \ | |/ | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs | ||||
| | * | Rework Diva's patch to simplify it | Melanie | 2012-03-22 | 2 | -16/+29 |
| | | | |||||
| | * | Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY ↵ | Melanie | 2012-03-22 | 3 | -86/+6 |
| | | | | | | | | | | | | | DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch." This reverts commit 6146e7ef258b10888ad7464b72b75cca701e02c9. | ||||
| | * | Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. ↵ | Diva Canto | 2012-03-22 | 3 | -6/+86 |
| | | | | | | | | | Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch. | ||||
| | * | refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code ↵ | Justin Clark-Casey (justincc) | 2012-03-22 | 4 | -9/+9 |
| | | | | | | | | | clarity since non-default animations are handled completely separately from this class | ||||
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-22 | 3 | -40/+101 |
| | |\ | |||||
| | | * | HG Friends: reroute the status notifications to the HGFriends service, so ↵ | Diva Canto | 2012-03-21 | 2 | -7/+26 |
| | | | | | | | | | | | | | that they can scale better. They were previously being handled by the UAS; that is still there, but it's now obsolete and will be removed in a future release. | ||||
| | | * | HG Friends: pulled sim-bound notification code to HGStatusNotifier, so that ↵ | Diva Canto | 2012-03-21 | 3 | -20/+58 |
| | | | | | | | | | | | | | we can better manage this traffic. | ||||
| | | * | Removed extraneous debug message | Diva Canto | 2012-03-21 | 1 | -3/+0 |
| | | | | |||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-20 | 4 | -60/+81 |
| | | |\ | |||||
| | | * | | Removed extraneous debug messages. Added a check for UUID.Zero. | Diva Canto | 2012-03-20 | 1 | -16/+23 |
| | | | | | |||||
| | * | | | Instead of loading default avatar animations in both SLUtil and ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 7 | -43/+83 |
| | | |/ | |/| | | | | | | | | | | | | | | | | | | | AvatarAnimations, load just in AvatarAnimations instead. This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST. This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND") but scripts refer to them with lowercase names (e.g. "sit"). | ||||
| | * | | If "debug scene updates true" then print out to log when a garbage ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -0/+3 |
| | | | | | | | | | | | | | collection occurs. | ||||
| | * | | Add Scene.DebugUpdates switch which, if turned on, will print out a warning ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -10/+32 |
| | | | | | | | | | | | | | | | | | | | | | | when a frame updates takes longer than twice the desired time This is controlled via "debug scene updates true|false" on the region console. Also fix an oversight with "debug scene teleport true|false" | ||||
| | * | | Incorporate scene teleporting debugging into "debug scene teleport ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 3 | -18/+6 |
| | | | | | | | | | | | | | true|false" command | ||||
| | * | | Replace "scene debug true false true" console command with "scene debug ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 3 | -37/+45 |
| | |/ | | | | | | | | | | | scripting true" or other parameters as appropriate. This is to allow individual switching of scene debug settings and to provide flexibiltiy for additional settings. | ||||
| * | | minor clean | UbitUmarov | 2012-03-21 | 1 | -27/+24 |
| | | | |||||
| * | | fix a bad reset of shapetype on pbshape change, added missing ↵ | UbitUmarov | 2012-03-21 | 1 | -7/+10 |
| | | | | | | | | | checksculpload ( to reload mesh on change ) | ||||
| * | | missed a creatMesh in chODE. temporary removed m_meshfailed test since it ↵ | UbitUmarov | 2012-03-21 | 1 | -4/+9 |
| | | | | | | | | | may colide with how meshs and sculpts are loaded. This needs a good revision.. | ||||
| * | | shapetype support on chOde so it can also request a simple convex hull 'mesh' | UbitUmarov | 2012-03-21 | 2 | -34/+46 |
| | | | |||||
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork | UbitUmarov | 2012-03-21 | 8 | -195/+327 |
| |\ \ | |||||
| | * \ | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 6 | -167/+303 |
| | |\ \ | | |/ | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs | ||||
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-20 | 1 | -1/+1 |
| | | |\ | |||||
| | | * | | Fixed borkness with map search introduce by my last changes to it. | Diva Canto | 2012-03-20 | 1 | -1/+1 |
| | | | | | |||||
| | | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-20 | 1 | -18/+7 |
| | | |\ \ | |||||
| | | * \ \ | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-20 | 17 | -232/+264 |
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Util.cs | ||||
| | | * | | | | HG Friends: allow the establishment of HG friendships without requiring ↵ | Diva Canto | 2012-03-20 | 5 | -167/+276 |
| | | | | | | | | | | | | | | | | | | | | | | | | | co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY. | ||||
| | | * | | | | Added GetUUID(first, last) on UserAgentsService so that we can finally make ↵ | Diva Canto | 2012-03-17 | 2 | -7/+34 |
| | | | | | | | | | | | | | | | | | | | | | | | | | direct user connections. | ||||
| | * | | | | | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | | * | | | | fix compile error from last commit | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -1/+1 |
| | | | |_|/ | | |/| | | |||||
| | * | | | | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 1 | -18/+7 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | refactor: simplify EstateManagementModule.handleEstateDebugRegionRequest() | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -18/+7 |
| | | | |/ | | |/| | |||||
| | * | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2012-03-21 | 5 | -129/+311 |
| | |\ \ \ | | | | | | | | | | | | | | | | careminster | ||||
| | * | | | | Move the health monitoring stuff where it will do some good | Melanie | 2012-03-21 | 1 | -3/+3 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 1 | -7/+14 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||||
| | | * | | | Add ability to log warn if a frame takes longer than twice the expected ↵ | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -7/+14 |
| | | | | | | | | | | | | | | | | | | | | | time. Currently commented out. | ||||
| * | | | | | Changes of PrimShapeType should now work with UbitOde ( almost untested ) | UbitUmarov | 2012-03-21 | 2 | -3727/+3750 |
| | | | | | | |||||
| * | | | | | Tell physics about physics shape when creating. Added some virtual methods ↵ | UbitUmarov | 2012-03-21 | 5 | -5/+57 |
| | | | | | | | | | | | | | | | | | | | | | to get/set density,gravmod, frition,bounce and shape type ( not in use ). UbitOde now should do convex type on creation or everytime the mesh is changed ( as in change size, shape, etc ) | ||||
| * | | | | | add convex state to mesh key, so a change is detected. | UbitUmarov | 2012-03-21 | 1 | -1/+1 |
| | |_|/ / |/| | | | |||||
| * | | | | Merge branch 'ubitwork' | Melanie | 2012-03-20 | 5 | -129/+311 |
| |\ \ \ \ | |/ / / |/| | | | |||||
| | * | | | let convex be a parameter to createMesh so it can be used. Was forced to add ↵ | UbitUmarov | 2012-03-21 | 4 | -7/+21 |
| | | | | | | | | | | | | | | | | | it also to original mesher code and zeromesher | ||||
| | * | | | added convex decomposition hulls support. Hardcoded to use mesh or this. ↵ | UbitUmarov | 2012-03-20 | 1 | -18/+146 |
| | | | | | | | | | | | | | | | | | (so no simple hull of convex prims for now). | ||||
| | * | | | WORK in progress!! Now it reads the simple hull shape to use if convex shape ↵ | UbitUmarov | 2012-03-20 | 2 | -124/+164 |
| | | | | | | | | | | | | | | | | | is selected for a prim. Due to ODE limitations on convex hulls colisions, it creates a mesh. Being work in progress it is hardcoded to only read that simple convex hull for now. It writes a file named "lixo_lixo.raw" that can be imported into blender for examination of the created mesh (the last one loaded and also hardcoded). To play with put in opensim.ini "meshing = UbitMeshmerizer" | ||||
| * | | | | Merge branch 'master' into careminster | Melanie | 2012-03-20 | 10 | -192/+205 |
| |\ \ \ \ | | |/ / | |/| | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs | ||||
| | * | | | Add prim name to "[MESH]: No recognized physics mesh..." log message | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | remove some mono compiler warnings | Justin Clark-Casey (justincc) | 2012-03-20 | 1 | -2/+0 |
| | | | | | |||||
 |
index : opensim-SC_OLD | |
| My fork of OpenSim for IG and MG, called SledjChisl. |
| aboutsummaryrefslogtreecommitdiffstatshomepage |