c11b3760da
just another test :)
2012-05-05 14:49:10 -07:00
f19fe50629
never say last test!!
2012-05-05 14:45:53 -07:00
86dd5adceb
one last test..
2012-05-05 14:42:33 -07:00
8d070cf47b
last test clean up the mess..
2012-05-05 14:32:40 -07:00
531c52abe3
test #2
2012-05-05 13:59:40 -07:00
9317b888f9
testing new opensimulator.org hardware out to make sure git still works!
2012-05-05 13:49:10 -07:00
2ab9588c9a
UbitODE: reduced the diference btw dinamic and static friction, making dinamic larger more identical to static.
2012-05-05 11:03:38 +01:00
e3226aecd9
SOG: tell physics about when we want a force or a impulse. (sorry add to change here also)
2012-05-05 10:47:51 +01:00
3b78e33d16
ubitODE prims: - moved outbounds checking back to UpdatePositionAndVelocity() from move() so it's done at end of each ode step and when it reports positions to core. There should be no need to check in both places. - Addforce() and AddAngularForce now apply a force if parameter pushforce is true or apply a impulse if false as it's actually needed (the prims grab case should be a force)
2012-05-05 10:40:03 +01:00
b62cc3ce0a
Merge branch 'avination' into careminster
2012-05-05 10:32:22 +01:00
31ab8b2fe0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-05-05 10:32:04 +01:00
163a86517a
force lower avatar density for testing
2012-05-05 03:28:35 +01:00
01b00ad0d5
Fire the scripting changed event with CHANGED_OWNER when an object that has changed owners is rezzed.
...
This needs to occur after the script is resumed rather than before, when the event is just dropped.
Addresses http://opensimulator.org/mantis/view.php?id=5890 and http://opensimulator.org/mantis/view.php?id=5952
2012-05-05 00:29:14 +01:00
e18686528e
Use the more efficient HashSet instead of List for FlotasmAssetCache.m_CurrentlyWriting
2012-05-04 23:03:33 +01:00
dec6ad2933
Don't try and update the access time of a file that is actively being cached.
...
This may cause IOErrors on Windows.
Aims to help with http://opensimulator.org/mantis/view.php?id=6003
2012-05-04 22:57:33 +01:00
6b3135aa4d
UbitODE: leave avatar 'freemove' state (entered on setmomentum) on any significant change like new 'velocity' or new position, etc, requests
2012-05-04 22:24:04 +01:00
da4819a170
Temporarily add debug log lines to lsl url request and release
...
To help with http://opensimulator.org/mantis/view.php?id=5993
2012-05-04 22:11:25 +01:00
c84ef57e52
minor: remove mono compiler warning
2012-05-04 21:04:42 +01:00
92fde6ed26
Mantis 60004 problems with damage and llSetDamage. In damage enabled areas this patch - Deletes any objects that have damage set > 0 that deliver that damage to an avatar Stops Gods receiving damage, Stops volume detect objects causing damage Deletes NPCS when their helth reduces to zero Gradually "heals" damage to an avatar Resets health on going to a non damage area
2012-05-04 21:01:09 +01:00
6096a1f30e
Change LongCallTime on WebUtil to 3000, to match the time where request handling is considered "slow".
...
This may be the wrong thing to do but stops lots of log spam in HG setups now that the monitoring is extended to other outgoing calls.
LongCallTime may need to be made configurable.
2012-05-04 20:53:30 +01:00
e83bc049df
refactor: Rename new DeleteFoldersEx/PurgeFoldersEx methods to DeleteFolders/PurgeFolders overloads as previously discussed with Oren - I think this makes more sense on balance
...
These overloads are not publicly available on core connectors or IInventoryService.
2012-05-04 20:37:21 +01:00
ad23774433
Allow deleting folders even if they're not in the Trash
...
The functions DeleteFolders() and PurgeFolder() still work as before, i.e. they only allow deleting folders that are in the Trash. However, the functions DeleteFoldersEx() and PurgeFolderEx() can now be used to delete any folder.
2012-05-04 20:30:46 +01:00
197163e12a
Fix teleporting from older to newer regions
2012-05-04 21:00:41 +02:00
333d013b5c
Add the default animation to the child agent data update
2012-05-04 20:33:48 +02:00
cccef2e56d
Calculate the Daylight Savings Time information sent to the viewer based on US Pacific Standard Time rather than whatever timezone the login server is set to.
...
This is because the viewer doesn't receive a timezone from the server but bases its displays on Pacific Standard Time.
However, it still expects to receive notification from the server as to whether or not Daylight Savings Time for PST is in operation.
This commit introduces a new DSTZone setting in the [LoginService] config setting that accepts a list of timezone names valid across different platforms to calculate Pacific DST.
If you need the old behaviour of calculating DST based on the local timezone of the server running the login service, then please override DSTZone with "local".
A mailing list announcement will be made later.
Thanks to Olivier Van Helden and Gudule Lapointe for determining this behaviour and providing this patch.
From http://opensimulator.org/mantis/view.php?id=5972
2012-05-04 19:21:43 +01:00
b5b21013da
Reverse the order of physics event unsubscription to allow GC. Adapted from Unit's reverted patch
2012-05-04 20:06:42 +02:00
1183310a05
Retain velocity on walking crossing - adapted from Ubit's reverted patch
2012-05-04 20:05:51 +02:00
88c4c7283f
Revert "*TO TEST/REVIEW* added current default animation in animationSet.cs to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);"
...
This reverts commit 12c9916193
2012-05-04 20:02:14 +02:00
12c9916193
*TO TEST/REVIEW* added current default animation in animationSet.cs to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);
2012-05-04 19:19:54 +01:00
58a1a0710c
SOG copy bug fix, now new group has own empty list of sitted avatars. Also changed crossing code to restore sitting avas in case of group cross fail
2012-05-04 11:32:37 +01:00
fb99ee6774
minor: Tweak BaseHttpServer message to make it clear that this relates to slow handling of inbound requests.
2012-05-04 01:16:56 +01:00
c9faf0df74
Extend 'slow' request logging to other server outbound requests (forms, rest, async rest) as well as the existing logging on outbound OSD requests.
...
Also prints out the first 100 chars of any slow request data since this can contain useful info (such as agent ID).
2012-05-04 01:12:56 +01:00
c221eaf0b0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-03 22:39:04 +01:00
fcd5b0817b
Reinsert a 2000ms delay before closing a no longer required agent on the source region after teleport to resolve Imprudence teleport problems.
...
Viewers 1 and 3 are fine with doing this immediately. However, Imprudence has a small delay (<200ms, >500ms) after receiving the AgentCompleteMovement reply packet on the destination region before regarding that region as the currnet region.
If Imprudence receives a DisableSimulator in this period, it quits.
We are not restoring the full 5000ms delay since this brings back a bug where teleports permanently fail if an avatar tries to teleport back too quickly.
This commit also sends the AgentCompleteMovement packet to the client before telling the source region to release its old agent, in order to further cut down any possibility of the DisableSimulator being recieved before the AgentMovementComplete.
2012-05-03 22:30:36 +01:00
100e4ca67e
Fixes Mantis #5999 . llSetLinkPrimitiveParams with PRIM_BUMP_SHINY did cause a runtime error.
2012-05-03 19:00:09 +02:00
bf5f8b54ae
Remove the somewhat misleading logging of the string length of some unknown requests, as this appeared to be some kind of numbered error code.
...
This brings these messages into line with similar messages that did not do this.
2012-05-03 02:22:06 +01:00
9ffc2c1062
minor: resolve some mono compiler warnings
2012-05-03 01:56:24 +01:00
231a3bf147
Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.
...
This is most useful for capabilities where the url is not self-describing.
2012-05-03 01:45:49 +01:00
2af7f50f26
Stabilize sit position on region crossing
2012-05-03 02:07:55 +02:00
9f9693dab8
Clear permissions given to the object we stand up from
2012-05-03 01:18:51 +02:00
8b1cc0dd29
Merge branch 'avination'
2012-05-03 00:15:45 +02:00
a135e51d23
Improved sitted avatars crossings ( plus tests on vehicles)
2012-05-02 22:08:09 +01:00
bf630fb808
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
2012-05-02 01:37:51 +01:00
40f3c24562
Comment out the five second sleep in etm.DoTeleport() if the old agent needs to be closed because it is no longer in the child's view distance.
...
This sleep appears unnecessary since a sleep has already occurred in WaitForCallback() whilst waiting for the destination region to notify of teleport success.
There are no async operations between this sleep and the WaitForCallback()
If this sleep is present, then teleporting back to the source region within 5 seconds results in a disconnection.
If this sleep is commented out then teleporting quickly back and forth between two simulators appears to work without issue.
Tested on standalone, local grid and distributed grid.
Please revert if there's something that I've missed.
2012-05-01 23:49:02 +01:00
8ef2a2b7de
Bogus change to get a version number
2012-05-02 00:35:52 +02:00
58d460542d
Merge branch 'avination'
2012-05-02 00:33:56 +02:00
82197c87a2
Merge branch 'ubitwork' into avination
2012-05-02 00:33:37 +02:00
e6e12c2d42
Merge branch 'avination'
2012-05-02 00:32:28 +02:00
98e9f22544
Preserve attachment rotation on objects rezzed via a script. Makes toasters
...
work right, finally.
2012-05-02 00:29:56 +02:00
a29f7f7551
Remove some test code that accidentally crept in with 9d2e1c67
2012-05-01 23:25:30 +01:00
nebadon