aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-231-14/+77
|\
| * Add a scene maintenance thread in parallel to the heartbeat thread. The main...Justin Clark-Casey (justincc)2012-03-231-14/+77
* | Merge branch 'master' into careminsterMelanie2012-03-232-56/+70
|\ \ | |/
| * Remove unnecessary shutting down check in Scene.Heartbeat(). Add some method...Justin Clark-Casey (justincc)2012-03-231-17/+20
| * Rename Scene.StartTimer() to Start() - this method no longer uses a timer. C...Justin Clark-Casey (justincc)2012-03-231-24/+25
| * Fix build breakJustin Clark-Casey (justincc)2012-03-231-1/+1
| * Fix bug in ScenePresenceAnimator.RemoveAnimation() introduced in commit 1a8769eJustin Clark-Casey (justincc)2012-03-232-3/+3
| * Comment out unused scene loop restart code.Justin Clark-Casey (justincc)2012-03-231-19/+22
| * Use m_lastFrameTick instead of m_lastUpdate in Scene.GetHealth(). m_lastUpda...Justin Clark-Casey (justincc)2012-03-231-2/+2
| * Add commented out section on collisions switch in Scene.SetSceneCoreDebug().Justin Clark-Casey (justincc)2012-03-231-0/+6
| * refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in M...Justin Clark-Casey (justincc)2012-03-221-11/+8
* | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-224-11/+22
|\ \ | |/
| * Fix llGiveInventory() so that it checks the destination part for AllowInvento...Justin Clark-Casey (justincc)2012-03-221-5/+5
| * Add llGiveInventory() test from object to object where both objects are owned...Justin Clark-Casey (justincc)2012-03-223-6/+17
* | Merge branch 'master' into careminsterMelanie2012-03-226-102/+190
|\ \ | |/
| * Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEF...Melanie2012-03-221-17/+0
| * Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Tu...Diva Canto2012-03-221-0/+17
| * refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code clarity...Justin Clark-Casey (justincc)2012-03-223-6/+6
| * Instead of loading default avatar animations in both SLUtil and AvatarAnimati...Justin Clark-Casey (justincc)2012-03-213-24/+79
| * If "debug scene updates true" then print out to log when a garbage collection...Justin Clark-Casey (justincc)2012-03-211-0/+3
| * Add Scene.DebugUpdates switch which, if turned on, will print out a warning w...Justin Clark-Casey (justincc)2012-03-211-10/+32
| * Incorporate scene teleporting debugging into "debug scene teleport true|false...Justin Clark-Casey (justincc)2012-03-212-2/+5
| * Replace "scene debug true false true" console command with "scene debug scrip...Justin Clark-Casey (justincc)2012-03-211-25/+30
* | fix a bad reset of shapetype on pbshape change, added missing checksculpload...UbitUmarov2012-03-211-7/+10
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-211-10/+17
|\ \
| * | Move the health monitoring stuff where it will do some goodMelanie2012-03-211-3/+3
| * | Merge branch 'master' into careminsterMelanie2012-03-201-7/+14
| |\ \ | | |/
| | * Add ability to log warn if a frame takes longer than twice the expected time....Justin Clark-Casey (justincc)2012-03-211-7/+14
* | | Changes of PrimShapeType should now work with UbitOde ( almost untested )UbitUmarov2012-03-211-17/+26
* | | Tell physics about physics shape when creating. Added some virtual methods to...UbitUmarov2012-03-211-0/+2
|/ /
* | Merge branch 'master' into careminsterMelanie2012-03-205-180/+197
|\ \ | |/
| * remove unnecessary tmpFrameMS, use maintc instead for frame time calculationJustin Clark-Casey (justincc)2012-03-201-3/+2
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-201-1/+1
| |\
| | * slight increase in jump power to make running jump slightly better.nebadon2012-03-201-1/+1
| * | Move frame loop entirely within Scene.Update() for better future performance ...Justin Clark-Casey (justincc)2012-03-204-168/+191
| |/
* | Merge branch 'master' into careminsterMelanie2012-03-201-1/+1
|\ \ | |/
| * reduce avatar verticle jump from the absurd 5 meter jump to a lessnebadon2012-03-201-1/+1
* | Merge branch 'ubitwork'Melanie2012-03-202-6/+31
|\ \
| * | add some more notifications about changes on physical parameters ( still inc...UbitUmarov2012-03-202-10/+13
* | | Cover the case where prims are loaded and ParentGroup is not yet setMelanie2012-03-201-5/+10
|/ /
* | Cause prims to be saved if extra physics parameters are changedMelanie2012-03-201-0/+5
* | Merge branch 'master' into careminsterMelanie2012-03-203-18/+12
|\ \ | |/
| * Remove pointless ThreadAbortException catching in a test that isn't run anyway.Justin Clark-Casey (justincc)2012-03-201-11/+5
| * Remove some pointless catching/throwing in the scene loop.Justin Clark-Casey (justincc)2012-03-201-7/+0
| * Add some doc about the EventManager.OnLoginsEnabled event.Justin Clark-Casey (justincc)2012-03-191-0/+7
* | Merge branch 'ubitwork'Melanie2012-03-192-0/+158
|\ \
| * | some more work on costsUbitUmarov2012-03-162-0/+158
* | | Merge branch 'master' into careminsterMelanie2012-03-187-118/+79
|\ \ \ | |/ / |/| / | |/
| * Moved HandleAvatarPickerRequest from the generic Scene.PacketHandlers to the ...Diva Canto2012-03-172-55/+0
| * Region access control! Region operators can now specify things like DisallowF...Diva Canto2012-03-171-2/+2