aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-261-1/+3
|\
| * Further simplify ScriptCommsMelanie2012-03-261-1/+3
| * Dynamically create the delegate type to reduce complexity in the callerMelanie2012-03-262-2/+23
| * Correct the design error I introduced into ScriptComms. Untested but about toMelanie2012-03-262-18/+25
* | Dynamically create the delegate type to reduce complexity in the callerMelanie2012-03-262-2/+23
* | Correct the design error I introduced into ScriptComms. Untested but about toMelanie2012-03-262-18/+25
* | Merge branch 'master' into careminsterMelanie2012-03-2512-130/+347
|\ \ | |/
| * Simplify the module invocation registration. The types and method nameMelanie2012-03-252-3/+20
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimMic Bowman2012-03-246-48/+85
| |\
| | * Allow the user to enter help topics in upper or lowercase.Justin Clark-Casey (justincc)2012-03-242-15/+18
| | * Hack example on to "terrain save-tile" extended help.Justin Clark-Casey (justincc)2012-03-241-0/+6
| | * Use system provided temporary file in "terrain save-tile" to avoid problems w...Justin Clark-Casey (justincc)2012-03-241-3/+3
| | * Give feedback when "terrain save-tile" is not successfully invoked.Justin Clark-Casey (justincc)2012-03-243-30/+58
| * | Add support for key, vector, rotation and list types for bothMic Bowman2012-03-244-74/+237
| |/
| * Have the PhysicsParameters module output console command responsesRobert Adams2012-03-231-5/+5
* | Merge branch 'master' into careminsterMelanie2012-03-234-6/+27
|\ \ | |/
| * fix yield prolog so it compiles with mono 2.11 there has been a bugzillanebadon2012-03-232-6/+6
| * 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 fo...Justin Clark-Casey (justincc)2012-03-231-0/+5
| * Add experimental SendPeriodicAppearanceUpdates = true/false setting to [Start...Justin Clark-Casey (justincc)2012-03-231-0/+17
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2012-03-231-14/+29
|\ \
| * | Make anims way more snappy. Decouple SP animation handling from physics frameMelanie2012-03-231-14/+29
* | | 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-236-85/+95
|\ \ \ | |/ / | | / | |/ |/|
| * 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-2220-99/+338
| |\
| | * 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 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
| * | Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-03-221-10/+5
| |\ \
| | * | RegionReady loggingBlueWall2012-03-221-10/+5
* | | | Merge branch 'master' into careminsterMelanie2012-03-220-0/+0
|\ \ \ \ | | |_|/ | |/| |
| * | | 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-228-12/+208
|\ \ \ \ | |/ / /
| * | | 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-227-7/+146
* | | | | 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
|\ \ \ \ | |/ / /
| * | | Change a false false to be truly true - or is this statement false?Melanie2012-03-221-1/+1
* | | | Merge branch 'master' into careminsterMelanie2012-03-2232-256/+654
|\ \ \ \ | |/ / /