| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into careminster | Melanie | 2012-03-23 | 1 | -14/+77 |
|\ |
|
| * | Add a scene maintenance thread in parallel to the heartbeat thread. The main... | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -14/+77 |
* | | Merge branch 'master' into careminster | Melanie | 2012-03-23 | 6 | -85/+95 |
|\ \
| |/ |
|
| * | Remove unnecessary shutting down check in Scene.Heartbeat(). Add some method... | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -17/+20 |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | BlueWall | 2012-03-22 | 18 | -99/+321 |
| |\ |
|
| | * | Rename Scene.StartTimer() to Start() - this method no longer uses a timer. C... | Justin Clark-Casey (justincc) | 2012-03-23 | 2 | -25/+26 |
| | * | Fix build break | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -1/+1 |
| | * | Fix bug in ScenePresenceAnimator.RemoveAnimation() introduced in commit 1a8769e | Justin Clark-Casey (justincc) | 2012-03-23 | 2 | -3/+3 |
| | * | Comment out unused scene loop restart code. | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -19/+22 |
| | * | Use m_lastFrameTick instead of m_lastUpdate in Scene.GetHealth(). m_lastUpda... | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -2/+2 |
| | * | Add commented out section on collisions switch in Scene.SetSceneCoreDebug(). | Justin Clark-Casey (justincc) | 2012-03-23 | 1 | -0/+6 |
| | * | Comment out login parameters debug output accidentally included with c4b2d24 | Justin Clark-Casey (justincc) | 2012-03-22 | 1 | -11/+13 |
| | * | Comment out a terrain save-tile debugging message that accidentally crept in ... | Justin Clark-Casey (justincc) | 2012-03-22 | 1 | -6/+6 |
| | * | refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in M... | Justin Clark-Casey (justincc) | 2012-03-22 | 1 | -11/+8 |
| * | | Merge branch 'master' of /home/opensim/src/opensim | BlueWall | 2012-03-22 | 1 | -10/+5 |
| |\ \ |
|
| | * | | RegionReady logging | BlueWall | 2012-03-22 | 1 | -10/+5 |
* | | | | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster | Melanie | 2012-03-22 | 8 | -12/+208 |
|\ \ \ \
| | |_|/
| |/| | |
|
| * | | | Fix llGiveInventory() so that it checks the destination part for AllowInvento... | Justin Clark-Casey (justincc) | 2012-03-22 | 2 | -6/+63 |
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2012-03-22 | 1 | -7/+10 |
| |\ \ \ |
|
| * | | | | Add llGiveInventory() test from object to object where both objects are owned... | Justin Clark-Casey (justincc) | 2012-03-22 | 7 | -7/+146 |
* | | | | | 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 |
* | | | | 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 |
| |\ \
| | |/ |
|