aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (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-235-74/+82
|\ \ | |/
| * Remove unnecessary shutting down check in Scene.Heartbeat(). Add some method...Justin Clark-Casey (justincc)2012-03-231-17/+20
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-03-2215-98/+306
| |\
| | * Rename Scene.StartTimer() to Start() - this method no longer uses a timer. C...Justin Clark-Casey (justincc)2012-03-232-25/+26
| | * 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
| | * Comment out a terrain save-tile debugging message that accidentally crept in ...Justin Clark-Casey (justincc)2012-03-221-6/+6
| | * refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in M...Justin Clark-Casey (justincc)2012-03-221-11/+8
| * | Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-03-221-10/+5
| |\ \
| | * | RegionReady loggingBlueWall2012-03-221-10/+5
* | | | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-226-11/+196
|\ \ \ \ | | |_|/ | |/| |
| * | | Fix llGiveInventory() so that it checks the destination part for AllowInvento...Justin Clark-Casey (justincc)2012-03-222-6/+63
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-221-7/+10
| |\ \ \
| * | | | Add llGiveInventory() test from object to object where both objects are owned...Justin Clark-Casey (justincc)2012-03-225-6/+134
* | | | | Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminsterMelanie2012-03-221-7/+10
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | HG Friends: don't notify if the server isn't there.Diva Canto2012-03-221-7/+10
| |/ / /
| * | | Change a false false to be truly true - or is this statement false?Melanie2012-03-221-1/+1
* | | | Fix merge issue from coreMelanie2012-03-221-1/+1
* | | | Merge branch 'master' into careminsterMelanie2012-03-2217-206/+340
|\ \ \ \ | |/ / /
| * | | Rework Diva's patch to simplify itMelanie2012-03-222-16/+29
| * | | Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEF...Melanie2012-03-223-86/+6
| * | | Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Tu...Diva Canto2012-03-223-6/+86
| * | | refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code clarity...Justin Clark-Casey (justincc)2012-03-224-9/+9
| |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-223-40/+101
| |\ \ | | |/
| | * HG Friends: reroute the status notifications to the HGFriends service, so tha...Diva Canto2012-03-212-7/+26
| | * HG Friends: pulled sim-bound notification code to HGStatusNotifier, so that w...Diva Canto2012-03-213-20/+58
| | * Removed extraneous debug messageDiva Canto2012-03-211-3/+0
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-204-60/+81
| | |\
| | * | Removed extraneous debug messages. Added a check for UUID.Zero.Diva Canto2012-03-201-16/+23
| * | | Instead of loading default avatar animations in both SLUtil and AvatarAnimati...Justin Clark-Casey (justincc)2012-03-217-43/+83
| | |/ | |/|
| * | 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-213-18/+6
| * | Replace "scene debug true false true" console command with "scene debug scrip...Justin Clark-Casey (justincc)2012-03-213-37/+45
| |/
* | minor cleanUbitUmarov2012-03-211-27/+24
* | fix a bad reset of shapetype on pbshape change, added missing checksculpload...UbitUmarov2012-03-211-7/+10
* | missed a creatMesh in chODE. temporary removed m_meshfailed test since it ma...UbitUmarov2012-03-211-4/+9
* | shapetype support on chOde so it can also request a simple convex hull 'mesh'UbitUmarov2012-03-212-34/+46
* | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-218-195/+327
|\ \
| * \ Merge branch 'master' into careminsterMelanie2012-03-216-167/+303
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-1/+1
| | |\
| | * | Fixed borkness with map search introduce by my last changes to it.Diva Canto2012-03-201-1/+1
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-201-18/+7
| | |\ \
| | * \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-2017-232/+264
| | |\ \ \
| | * | | | HG Friends: allow the establishment of HG friendships without requiring co-pr...Diva Canto2012-03-205-167/+276