aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge branch 'master' into careminsterMelanie2012-03-231-14/+77
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Add a scene maintenance thread in parallel to the heartbeat thread. The ↵Justin Clark-Casey (justincc)2012-03-231-14/+77
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | maintenance thread will end up running regular jobs that don't need to be in the main scene loop. The idea is to make the critical main scene loop as skinny as possible - it doesn't need to run things that aren't time critical and don't depend on update ordering. This will be done gradually over time to try and uncover any issues. Many non-criticial scene loop activities are being launched on separate threadpool threads anyway. This may also allow modules to register their own maintenance jobs without having to maintain their own timers and threads. Currently the maintenance loop runs once a second, as opposed to the 89ms scene loop.
* | | | | Merge branch 'master' into careminsterMelanie2012-03-236-85/+95
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | | | | Conflicts: OpenSim/Region/Application/OpenSimBase.cs OpenSim/Region/Framework/Scenes/Scene.cs
| * | | Remove unnecessary shutting down check in Scene.Heartbeat(). Add some ↵Justin Clark-Casey (justincc)2012-03-231-17/+20
| | | | | | | | | | | | | | | | method doc. Rename HeartbeatThread, shuttingdown to conform to code standards.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-03-2218-99/+321
| |\ \ \
| | * | | Rename Scene.StartTimer() to Start() - this method no longer uses a timer. ↵Justin Clark-Casey (justincc)2012-03-232-25/+26
| | | | | | | | | | | | | | | | | | | | Comment out more effectively unused old heartbeat code.
| | * | | 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
| | | | | | | | | | | | | | | | | | | | Forgot to uppercase the animation name for default animations, since for some reason we store and use them in upper rather than lowercase.
| | * | | Comment out unused scene loop restart code.Justin Clark-Casey (justincc)2012-03-231-19/+22
| | | | | | | | | | | | | | | | | | | | This has actually been unused since at least 0.7.2 due to earlier changes.
| | * | | Use m_lastFrameTick instead of m_lastUpdate in Scene.GetHealth(). ↵Justin Clark-Casey (justincc)2012-03-231-2/+2
| | | | | | | | | | | | | | | | | | | | m_lastUpdate is no longer properly updated and is redundant anyway.
| | * | | Add commented out section on collisions switch in Scene.SetSceneCoreDebug().Justin Clark-Casey (justincc)2012-03-231-0/+6
| | | | | | | | | | | | | | | | | | | | This was not implemented before the recent changes but should be at some point.
| | * | | Comment out login parameters debug output accidentally included with c4b2d24Justin Clark-Casey (justincc)2012-03-221-11/+13
| | | | |
| | * | | Comment out a terrain save-tile debugging message that accidentally crept in ↵Justin Clark-Casey (justincc)2012-03-221-6/+6
| | | | | | | | | | | | | | | | | | | | with c4b2d24
| | * | | refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in ↵Justin Clark-Casey (justincc)2012-03-221-11/+8
| | | | | | | | | | | | | | | | | | | | MoveTaskInventoryItem()
| * | | | Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-03-221-10/+5
| |\ \ \ \
| | * | | | RegionReady loggingBlueWall2012-03-221-10/+5
| | | |/ / | | |/| | | | | | | | | | | | Some maintenance to clean up logging messages
* | | | | Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminsterMelanie2012-03-228-12/+208
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
| * | | | Fix llGiveInventory() so that it checks the destination part for ↵Justin Clark-Casey (justincc)2012-03-222-6/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | AllowInventoryDrop, not the source. This allows llAllowInventoryDrop() to work. Regression test added for this case.
| * | | | 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 ↵Justin Clark-Casey (justincc)2012-03-227-7/+146
| | | | | | | | | | | | | | | | | | | | | | | | owned by the same user.
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | Fixes perms boo-boo
* | | | | Fix merge issue from coreMelanie2012-03-221-1/+1
| | | | |
* | | | | Merge branch 'master' into careminsterMelanie2012-03-2230-252/+646
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
| * | | | Rework Diva's patch to simplify itMelanie2012-03-223-16/+30
| | | | |
| * | | | Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY ↵Melanie2012-03-224-88/+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 Canto2012-03-224-6/+88
| | | | | | | | | | | | | | | | | | | | 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-224-9/+9
| |/ / / | | | | | | | | | | | | clarity since non-default animations are handled completely separately from this class
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-2212-64/+376
| |\ \ \ | | |/ /
| | * | Updated the UserAccountsClient a little bit, plus some more sanity checks on ↵Diva Canto2012-03-212-22/+53
| | | | | | | | | | | | | | | | the service connector.
| | * | HG Friends: reroute the status notifications to the HGFriends service, so ↵Diva Canto2012-03-219-8/+248
| | | | | | | | | | | | | | | | 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 Canto2012-03-213-20/+58
| | | | | | | | | | | | | | | | we can better manage this traffic.
| | * | Removed extraneous debug messageDiva Canto2012-03-211-1/+0
| | | |
| | * | Removed extraneous debug messageDiva Canto2012-03-211-3/+0
| | | |
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2012-03-205-60/+143
| | |\ \
| | * | | 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 ↵Justin Clark-Casey (justincc)2012-03-2110-99/+85
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | 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-212-0/+65
| | | | | | | | | | | | | | | | collection occurs.
| * | | Add Scene.DebugUpdates switch which, if turned on, will print out a warning ↵Justin Clark-Casey (justincc)2012-03-211-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-213-18/+6
| | | | | | | | | | | | | | | | true|false" command
| * | | Replace "scene debug true false true" console command with "scene debug ↵Justin Clark-Casey (justincc)2012-03-213-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.
* | | Revert "Stop messing order of updates, destroing the defined order of the ↵Melanie2012-03-211-8/+3
| | | | | | | | | | | | | | | | | | selected priority (by distance being the one that makes sense(?). So called fairness serves no usefull purpose. If a region is lagged or user has bad comms, and far objects updates don't arrive, at least nearby thinks do have a chance to keep ticking. Just test on a big region and observe rez order on arrival. lower viewer bandwith helps seeing the diference. No use to put in core since cmic loves the priority scrambling code i comented out." This reverts commit 68981d01f024f8a46949127e1cc23c81282f5220.
* | | Stop messing order of updates, destroing the defined order of the selected ↵UbitUmarov2012-03-211-3/+8
| | | | | | | | | | | | priority (by distance being the one that makes sense(?). So called fairness serves no usefull purpose. If a region is lagged or user has bad comms, and far objects updates don't arrive, at least nearby thinks do have a chance to keep ticking. Just test on a big region and observe rez order on arrival. lower viewer bandwith helps seeing the diference. No use to put in core since cmic loves the priority scrambling code i comented out.
* | | minor cleanUbitUmarov2012-03-211-27/+24
| | |
* | | fix a bad reset of shapetype on pbshape change, added missing ↵UbitUmarov2012-03-211-7/+10
| | | | | | | | | | | | checksculpload ( to reload mesh on change )
* | | missed a creatMesh in chODE. temporary removed m_meshfailed test since it ↵UbitUmarov2012-03-211-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'UbitUmarov2012-03-212-34/+46
| | |
* | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-03-2118-324/+1042
|\ \ \
| * \ \ Merge branch 'master' into careminsterMelanie2012-03-2116-296/+1018
| |\ \ \ | | |/ / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
generated by cgit v1.1 at 2024-12-22 11:42:22 +0000