923e5df7ae
Merge branch 'master' into careminster
2013-01-13 13:44:24 +00:00
b592ec265b
BulletSim: fix the 'No recognised physics mesh found ...' error spew by remembering that the last asset fetch failed until the simulator resets the shape parameters.
2013-01-11 16:44:34 -08:00
72cc94cfbc
add some sanity checking to HandleAgentRequestSit handler
2013-01-10 20:21:18 -08:00
660d36a5b0
Implement a workaround solution for saving manual script state changes by the user before logout instead of wrongly removing the script early.
...
This workaround relies on the fact that a closing client goes inactive before the attachments derez calls happen.
This reverts the change to remove scripts too early instead of stopping them, since the the two step stop then remove is necessary to execute the detach event.
2013-01-11 02:28:43 +00:00
d4f340b96f
Merge branch 'master' into careminster
2013-01-11 02:18:01 +00:00
f74915ed4f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2013-01-11 02:13:10 +00:00
05ac6d3209
Save attachments on detach/exit if a contained script state has been changed.
...
This involves making Attachments module listen for start/stop script changes.
It also involves removing the script from the region on detach in the same manner as every other DeleteSceneObject() call rather than simply stopping it
This is necessary tue to the bad assymetry of start and stop script triggers but it appears to be the correct behaviour anyway, as detached objects are completely gone from the sim.
Not just in a state where their scripts have been stopped.
2013-01-11 01:46:36 +00:00
26347307ec
Fix a regression in the last few scene commands changes where setting these via the viewer estate dialog stopped working.
...
Forgot to register the new interface.
Also removes some code which got included by adpating an existing module.
2013-01-11 00:08:52 +00:00
f3a2bbbd93
Add "debug scene get" console command to list current scene options
2013-01-10 23:56:11 +00:00
a16ae5d7e3
Move scene debug commands into separate module. Command changes from "debug scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings
2013-01-10 23:49:48 +00:00
983e458bb6
refactor: route the final scene backup through the same code that handles periodic backup
...
This is rather than making unnecessary duplicate checks that the SOG later performs again.
2013-01-10 22:59:40 +00:00
17f21ba9a0
minor: Capitalize GroupsModule command category
2013-01-10 22:46:25 +00:00
e65737be93
minor: add missing newline to "debug scene" console command
2013-01-10 22:42:33 +00:00
f566dc0618
Remove unimplemented "debug teleport" console command
2013-01-10 22:42:12 +00:00
701ca1e4b8
Add "debug scene pbackup true|false" console command. This enables or disable periodic scene backup. For debug purposes.
...
If false, scene is still saved on shutdown.
2013-01-10 22:38:48 +00:00
170d376967
On baked texture save, replace any HG ID with an ordinary asset ID so the HGAssetBroker doesn't try to save back to the avatar's originating region
2013-01-10 01:45:56 +00:00
3a495ccd56
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2013-01-10 01:38:03 +00:00
84407e322f
revert accidental change to MemoryWatchdog stat calculation in previous b1b4687
2013-01-10 01:30:00 +00:00
aecb32b74e
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2013-01-10 01:25:07 +00:00
b1b4687250
Add "show script timers" command to show script timers. For debug purposes.
...
Also, "show sensors" changes to "show script sensors".
2013-01-10 00:57:49 +00:00
a0000a034f
Add "show sensors" command to show script sensor information for debug purposes.
2013-01-10 00:32:22 +00:00
949da1d4af
Change IsRoot to use ReferenceEquals to prevent operator == messiness
2013-01-09 20:07:21 +01:00
b70d50edf2
fix llGetRot and parameters prim_rotation for attachments. Only on
...
LSL_api to avoid side effects for now
2013-01-09 17:59:32 +00:00
b528281018
stop endless loop in lGetLinkPrimitiveParams
2013-01-09 17:01:09 +00:00
27b0914681
Prevent a null ref in llGetLinkPrimiteveParams. Still not a fix for the real
...
issue.
2013-01-09 16:01:00 +01:00
7d519fde3b
Merge branch 'teravuswork' into avination
2013-01-09 09:19:52 +01:00
290dc274ec
minor: Remove unnecessary commented out code from last commit c28a2f05 and fix up code comment
2013-01-09 01:04:43 +00:00
c28a2f05ca
minor: make spacing consistent in console help output
2013-01-09 00:54:28 +00:00
e4fad4a09d
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2013-01-09 00:21:43 +00:00
df1d7414ad
BulletSim: Fix hover height (boats float at the correct level).
...
Fix problem of vehicles going crazy when backing up.
2013-01-08 16:37:49 -08:00
f16c4a254c
Revert "Prevent empty Anim Packs"
...
This reverts commit 5561333668
2013-01-09 00:20:24 +00:00
c1c540f454
Revert "Fix sequence id fr default anim"
...
This reverts commit a775931a0c
2013-01-09 00:20:14 +00:00
3d5e3e35b7
minor: Fix command match of "debug script" command to "debug scripts" to match other scripts commands (and it's own short help text)
2013-01-09 00:08:08 +00:00
5fa4b8b144
minor: Allow "script *" console commands to take multiple script item ids
2013-01-09 00:01:48 +00:00
a775931a0c
Fix sequence id fr default anim
2013-01-08 23:36:05 +00:00
5561333668
Prevent empty Anim Packs
2013-01-08 23:12:32 +00:00
92db4ef068
Revert "Prevent empty Anim Packs"
...
This reverts commit ab053df706
2013-01-09 00:11:08 +01:00
be844030ce
Revert "Fix sequence id fr default anim"
...
This reverts commit 8f37f2ca7e
2013-01-09 00:10:57 +01:00
2ac96dd181
Add the new UpdateAgentInformation cap to make maturity on more recent viewers
...
work.
2013-01-08 22:52:14 +00:00
8f37f2ca7e
Fix sequence id fr default anim
2013-01-08 23:24:34 +01:00
ab053df706
Prevent empty Anim Packs
2013-01-08 23:01:09 +01:00
0a393b317d
Add the new UpdateAgentInformation cap to make maturity on more recent viewers
...
work.
2013-01-08 22:32:39 +01:00
0aabb93ef3
Remove now superfluous update of m_lastSize
2013-01-08 14:00:40 +01:00
e1cfa846ea
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2013-01-08 13:58:42 +01:00
fb088a48ac
also update m_lastSize in SendAvatarDataToAllAgents so more paths update
...
it
2013-01-08 14:09:01 +00:00
ef8f03b711
Prevent avatar data from being sent during login when it's not valid and
...
crashes login on some viewers.
2013-01-08 13:57:45 +01:00
09d41f4f78
Revert "Remove sending AvatarData because this also happens on login, where it chokes"
...
This reverts commit d1fa650c3f
2013-01-08 13:11:04 +01:00
f86278e389
Merge branch 'teravuswork' into avination
2013-01-08 12:14:08 +01:00
4cd1fd7485
Merge branch 'ubitwork' into avination
2013-01-08 12:14:01 +01:00
d1fa650c3f
Remove sending AvatarData because this also happens on login, where it chokes
...
Firestorm, Singularity and other viewers with the new appearance pipeline.
2013-01-08 12:08:34 +01:00
Melanie