Melanie
da9743d1d7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 14:22:49 +01:00
Melanie
3810e98474
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 14:21:15 +01:00
Melanie
7e0936e4b6
Add a hust UUID to the script invocations
2012-03-26 14:19:55 +01:00
Mic Bowman
055269805d
Fix compile error in ScriptModuelComms and add some debugging into the modInvoke
...
routines to simplify finding method registration issues.
2012-03-25 22:59:06 -07:00
Melanie
98a6c78943
Fix the omission on the interface declaration
2012-03-26 03:33:39 +01:00
Melanie
5f1f956d17
Fix the omission on the interface declaration
2012-03-26 03:32:30 +01:00
Melanie
2c42dafe56
Fix Typo
2012-03-26 03:26:02 +01:00
Melanie
e05c72d32f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 03:22:26 +01:00
Melanie
c9c01d5226
Further simplify ScriptComms
2012-03-26 03:20:40 +01:00
Melanie
ac0f1ff0a6
Dynamically create the delegate type to reduce complexity in the caller
2012-03-26 01:47:20 +01:00
Melanie
d7cc194e83
Correct the design error I introduced into ScriptComms. Untested but about to
...
be.
2012-03-26 01:47:14 +01:00
Melanie
5e8d64c943
Dynamically create the delegate type to reduce complexity in the caller
2012-03-26 01:21:44 +01:00
Melanie
4b76c52c41
Correct the design error I introduced into ScriptComms. Untested but about to
...
be.
2012-03-26 00:30:52 +01:00
Melanie
44f1f87656
Merge branch 'master' into careminster
2012-03-25 20:07:43 +01:00
Melanie
cb44808504
Simplify the module invocation registration. The types and method name
...
can be pulled fromt he delegate so we don't need to pass them explicitly
2012-03-25 19:52:38 +01:00
Mic Bowman
a07fa0395f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-24 22:45:17 -07:00
Mic Bowman
a14437ad5a
Add support for key, vector, rotation and list types for both
...
arguments and return values to the modInvoke family of functions.
See http://opensimulator.org/wiki/OSSL_Script_Library/ModInvoke
2012-03-24 22:43:42 -07:00
Justin Clark-Casey (justincc)
4f17537555
Allow the user to enter help topics in upper or lowercase.
...
Forcing uppercase (e.g. help Assets) is too annoying.
Thanks to WhiteStar for pointing this out.
2012-03-24 03:07:01 +00:00
Justin Clark-Casey (justincc)
f03c3c062e
Hack example on to "terrain save-tile" extended help.
...
Thanks to Garmin Kawaguichi for the initially suggested text.
2012-03-24 02:41:45 +00:00
Justin Clark-Casey (justincc)
f53c6b2594
Use system provided temporary file in "terrain save-tile" to avoid problems with drive letters on windows
...
Thanks to Garmin Kawaguichi for picking up on this and providing an initial solution (which I adapted).
2012-03-24 02:30:43 +00:00
Justin Clark-Casey (justincc)
cf61c74e90
Give feedback when "terrain save-tile" is not successfully invoked.
2012-03-24 02:16:44 +00:00
Robert Adams
164706043d
Have the PhysicsParameters module output console command responses
...
directly to the console rather than logging at INFO (which doesn't
output anything for WARN).
There should really be a WriteLine method on ICommandConsole so all
of the different commands don't have to figure out where the command
output should go.
2012-03-23 13:11:58 -07:00
Melanie
9a67baae21
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-23 14:24:55 +00:00
nebadon
6b87a29c86
fix yield prolog so it compiles with mono 2.11 there has been a bugzilla
...
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
2012-03-23 02:22:57 -07:00
Melanie
1ae9ab685a
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-23 03:49:22 +00:00
Justin Clark-Casey (justincc)
d4beb2f5bc
Comment out log message about sending periodic appearance updates.
2012-03-23 03:39:39 +00:00
Justin Clark-Casey (justincc)
e5b182fb41
Add information about SendPeriodicAppearanceUpdates to OpenSimDefaults.ini for now.
...
Default remains false.
2012-03-23 03:38:33 +00:00
Justin Clark-Casey (justincc)
54887bf386
Add experimental SendPeriodicAppearanceUpdates = true/false setting to [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.
2012-03-23 03:33:07 +00:00
Justin Clark-Casey (justincc)
4ed833bc9d
Add a scene maintenance thread in parallel to the heartbeat thread. The 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.
2012-03-23 02:49:29 +00:00
Melanie
fac89b6671
Merge branch 'master' into careminster
2012-03-23 02:46:49 +00:00
Melanie
2190a62366
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-23 02:44:22 +00:00
Melanie
ade164667f
Make anims way more snappy. Decouple SP animation handling from physics frame
...
time.
2012-03-23 03:16:07 +01:00
Justin Clark-Casey (justincc)
349454ca27
Remove unnecessary shutting down check in Scene.Heartbeat(). Add some method doc. Rename HeartbeatThread, shuttingdown to conform to code standards.
2012-03-23 01:46:11 +00:00
BlueWall
c0672cb7db
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-22 21:27:03 -04:00
BlueWall
176bba4f67
Merge branch 'master' of /home/opensim/src/opensim
2012-03-22 21:26:30 -04:00
Justin Clark-Casey (justincc)
18b3f1132e
Rename Scene.StartTimer() to Start() - this method no longer uses a timer. Comment out more effectively unused old heartbeat code.
2012-03-23 01:21:43 +00:00
Justin Clark-Casey (justincc)
4ee8b3e23e
Fix build break
2012-03-23 01:11:43 +00:00
Justin Clark-Casey (justincc)
a9995ede65
Fix bug in ScenePresenceAnimator.RemoveAnimation() introduced in commit 1a8769e
...
Forgot to uppercase the animation name for default animations, since for some reason we store and use them in upper rather than lowercase.
2012-03-23 01:08:13 +00:00
Justin Clark-Casey (justincc)
bc2963d42a
Comment out unused scene loop restart code.
...
This has actually been unused since at least 0.7.2 due to earlier changes.
2012-03-23 01:03:10 +00:00
Justin Clark-Casey (justincc)
08b8ebcc7e
Use m_lastFrameTick instead of m_lastUpdate in Scene.GetHealth(). m_lastUpdate is no longer properly updated and is redundant anyway.
2012-03-23 00:55:11 +00:00
BlueWall
c903813e00
RegionReady logging
...
Some maintenance to clean up logging messages
2012-03-22 20:49:45 -04:00
Justin Clark-Casey (justincc)
40b9b519b8
Add commented out section on collisions switch in Scene.SetSceneCoreDebug().
...
This was not implemented before the recent changes but should be at some point.
2012-03-23 00:12:14 +00:00
Justin Clark-Casey (justincc)
15c2499ccd
Comment out login parameters debug output accidentally included with c4b2d24
2012-03-22 23:31:41 +00:00
Justin Clark-Casey (justincc)
c1d064e1ca
Comment out a terrain save-tile debugging message that accidentally crept in with c4b2d24
2012-03-22 23:16:52 +00:00
Melanie
dfd7068864
Merge branch 'master' into careminster
2012-03-22 23:06:25 +00:00
Melanie
ed67b698d3
Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-03-22 23:05:58 +00:00
Melanie
9edf99703a
Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminster
2012-03-22 23:01:50 +00:00
Justin Clark-Casey (justincc)
5bf45b9b98
refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in MoveTaskInventoryItem()
2012-03-22 22:40:38 +00:00
Justin Clark-Casey (justincc)
760010d6fb
Fix llGiveInventory() so that it checks the destination part for AllowInventoryDrop, not the source.
...
This allows llAllowInventoryDrop() to work.
Regression test added for this case.
2012-03-22 22:33:37 +00:00
Justin Clark-Casey (justincc)
3bcf71c647
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-22 22:33:16 +00:00