aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-234-6/+27
|\ | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/Scene.cs
| * fix yield prolog so it compiles with mono 2.11 there has been a bugzillanebadon2012-03-232-6/+6
| | | | | | | | | | | | report files with mono project in regards to this change, this simply lets us move forward with using mono 2.11 for now : https://bugzilla.xamarin.com/show_bug.cgi?id=4052
| * Comment out log message about sending periodic appearance updates.Justin Clark-Casey (justincc)2012-03-231-2/+2
| |
| * Add information about SendPeriodicAppearanceUpdates to OpenSimDefaults.ini ↵Justin Clark-Casey (justincc)2012-03-231-0/+5
| | | | | | | | | | | | for now. Default remains false.
| * Add experimental SendPeriodicAppearanceUpdates = true/false setting to ↵Justin Clark-Casey (justincc)2012-03-231-0/+17
| | | | | | | | | | | | | | | | | | | | [Startup] in OpenSim.ini On osgrid and other places, I have observed that manually sending appearance updates from the console often relieves grey avatar syndrome. Despite hunting high and low, I haven't been able to find where this packet is sometimes being lost - it might be a persistent viewer bug for all I know. Therefore, this experimental setting resends appearance data for everybody in the scene every 60 seconds. These packets are small and the viewer only fetches texture data if it doesn't already have it. Default is false.
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵Melanie2012-03-231-14/+29
|\ \ | | | | | | | | | careminster
| * | Make anims way more snappy. Decouple SP animation handling from physics frameMelanie2012-03-231-14/+29
| | | | | | | | | | | | time.
* | | 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-2220-99/+338
| |\
| | * 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
| * | 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 branch 'master' into careminsterMelanie2012-03-220-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in ↵Justin Clark-Casey (justincc)2012-03-221-11/+8
| | | | | | | | | | | | | | | | MoveTaskInventoryItem()
* | | | 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-223-7/+27
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | HG Friends: don't notify if the server isn't there.Diva Canto2012-03-221-7/+10
| |/ / /
| * | | Added new simple_build_permissions config to the .ini and .example files.Diva Canto2012-03-222-0/+17
| | | |
* | | | Fix merge issue from coreMelanie2012-03-221-1/+1
| | | |
* | | | Merge branch 'master' into careminsterMelanie2012-03-220-0/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/World/Land/LandObject.cs
| * | | Change a false false to be truly true - or is this statement false?Melanie2012-03-221-1/+1
| | | | | | | | | | | | | | | | Fixes perms boo-boo
* | | | Merge branch 'master' into careminsterMelanie2012-03-2232-256/+654
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | 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-226-103/+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-226-6/+103
| | | | | | | | | | | | | | | | Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-03-221-2/+2
| |\ \ \ | | |/ /
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimBlueWall2012-03-2110-99/+85
| | |\ \ | | | |/ | | |/|
| | * | Fix typoBlueWall2012-03-211-2/+2
| | | | | | | | | | | | | | | | Add enclosing " to urls
| * | | 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-2213-66/+382
| |\ \ | | |/
| | * 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
| | |\
| | * | HG Friends config for Robust.HG.ini.exampleDiva Canto2012-03-201-2/+6
| | | |
generated by cgit v1.1 at 2024-12-23 09:10:36 +0000