| Commit message (Expand) | Author | Age | Files | Lines |
* | Fix merge issue from core | Melanie | 2012-03-22 | 1 | -1/+1 |
* | Merge branch 'master' into careminster | Melanie | 2012-03-22 | 30 | -252/+646 |
|\ |
|
| * | Rework Diva's patch to simplify it | Melanie | 2012-03-22 | 3 | -16/+30 |
| * | Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEF... | Melanie | 2012-03-22 | 4 | -88/+6 |
| * | Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Tu... | Diva Canto | 2012-03-22 | 4 | -6/+88 |
| * | refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code clarity... | Justin Clark-Casey (justincc) | 2012-03-22 | 4 | -9/+9 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-22 | 12 | -64/+376 |
| |\ |
|
| | * | Updated the UserAccountsClient a little bit, plus some more sanity checks on ... | Diva Canto | 2012-03-21 | 2 | -22/+53 |
| | * | HG Friends: reroute the status notifications to the HGFriends service, so tha... | Diva Canto | 2012-03-21 | 9 | -8/+248 |
| | * | HG Friends: pulled sim-bound notification code to HGStatusNotifier, so that w... | Diva Canto | 2012-03-21 | 3 | -20/+58 |
| | * | Removed extraneous debug message | Diva Canto | 2012-03-21 | 1 | -1/+0 |
| | * | 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 | 5 | -60/+143 |
| | |\ |
|
| | * | | 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 AvatarAnimati... | Justin Clark-Casey (justincc) | 2012-03-21 | 10 | -99/+85 |
| | |/
| |/| |
|
| * | | If "debug scene updates true" then print out to log when a garbage collection... | Justin Clark-Casey (justincc) | 2012-03-21 | 2 | -0/+65 |
| * | | Add Scene.DebugUpdates switch which, if turned on, will print out a warning w... | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -10/+32 |
| * | | Incorporate scene teleporting debugging into "debug scene teleport true|false... | Justin Clark-Casey (justincc) | 2012-03-21 | 3 | -18/+6 |
| * | | Replace "scene debug true false true" console command with "scene debug scrip... | Justin Clark-Casey (justincc) | 2012-03-21 | 3 | -37/+45 |
| |/ |
|
* | | Revert "Stop messing order of updates, destroing the defined order of the sel... | Melanie | 2012-03-21 | 1 | -8/+3 |
* | | Stop messing order of updates, destroing the defined order of the selected pr... | UbitUmarov | 2012-03-21 | 1 | -3/+8 |
* | | minor clean | UbitUmarov | 2012-03-21 | 1 | -27/+24 |
* | | fix a bad reset of shapetype on pbshape change, added missing checksculpload... | UbitUmarov | 2012-03-21 | 1 | -7/+10 |
* | | missed a creatMesh in chODE. temporary removed m_meshfailed test since it ma... | UbitUmarov | 2012-03-21 | 1 | -4/+9 |
* | | 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 | 18 | -324/+1042 |
|\ \ |
|
| * \ | Merge branch 'master' into careminster | Melanie | 2012-03-21 | 16 | -296/+1018 |
| |\ \
| | |/ |
|
| | * | Refix the fixed fix! | Melanie | 2012-03-21 | 1 | -2037/+2037 |
| | * | 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 |
| | |\ \ |
|
| | * | | | Fixed borkness with previous merge. | Diva Canto | 2012-03-20 | 1 | -16/+1 |
| | * | | | Line endings | Diva Canto | 2012-03-20 | 1 | -89/+89 |
| | * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Diva Canto | 2012-03-20 | 25 | -308/+509 |
| | |\ \ \ |
|
| | * | | | | HG Friends: allow the establishment of HG friendships without requiring co-pr... | Diva Canto | 2012-03-20 | 13 | -2189/+2785 |
| | * | | | | Added GetUUID(first, last) on UserAgentsService so that we can finally make d... | Diva Canto | 2012-03-17 | 6 | -10/+136 |
| * | | | | | 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 |
| |\ \ \ |
|
| * | | | | 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 time.... | Justin Clark-Casey (justincc) | 2012-03-21 | 1 | -7/+14 |
* | | | | | 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 to... | UbitUmarov | 2012-03-21 | 5 | -5/+57 |
* | | | | | add convex state to mesh key, so a change is detected. | UbitUmarov | 2012-03-21 | 2 | -1/+9 |
| |_|/ /
|/| | | |
|
* | | | | 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 |
| * | | | added convex decomposition hulls support. Hardcoded to use mesh or this. (so... | UbitUmarov | 2012-03-20 | 1 | -18/+146 |