Justin Clark-Casey (justincc)
6987aef38d
Improve logging on the prim inventory script asset request path for future use.
...
This adds name and description of the request handler to http request logging when DebugLevel >= 1
2012-05-09 23:12:30 +01:00
Justin Clark-Casey (justincc)
e813f41478
Escape and unescape xml element names if necessary in ServerUtils.BuildXmlData() and ParseElement()
...
If AvatarService appearance data is retrieved over the network, then ServerUtils was attempting to transfer names such as "Wearable 0:0" directly to xml element names, resulting in an exception.
Space is not valid in xml element names. Neither is : in this case since the intention is not to namespace. Using names directly as keys is not a good idea.
To get around this problem this patch escapes and unescapes the element names as appropriate.
This has no impact on existing xml (since it had to be valid in the first place) but allows AvatarService data to be used over the network.
Setting appearance (from simulator to AvatarService) did not suffer this problem since the values are passed in the query string which is already properly escaped.
2012-05-09 21:11:14 +01:00
Melanie
50321fb7bf
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-05-09 00:43:33 +01:00
Talun
61e99bcdcb
Mantis 6015 new LSL function llGetAgentList.
...
Details in the lsl wiki
2012-05-09 00:14:24 +01:00
Justin Clark-Casey (justincc)
e5dbb652d5
Remove physics actor related race conditions in SetVehicleFlags() and SetPhysicsAxisRotation()
...
sop.PhysActor can currently become null at any time.
2012-05-09 00:11:10 +01:00
Dan Lake
3bc5620d74
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-08 16:06:02 -07:00
Dan Lake
20952c75c5
Trigger event when scene presences are updated
2012-05-08 16:05:34 -07:00
Talun
c21c9e13ef
Mantis 1456 same region teleport of a sitting avatar.
...
Region to region was fixed some time ago in EntityTransferModule.
This applies the same fix for same region teleports.
2012-05-09 00:02:13 +01:00
Justin Clark-Casey (justincc)
ef279c5a62
Add automated TestllBreakLink()
2012-05-08 23:36:23 +01:00
Justin Clark-Casey (justincc)
c0658a102e
Add automated TestllCreateLink()
2012-05-08 23:29:51 +01:00
Justin Clark-Casey (justincc)
6406d5a5b9
refactor: Eliminate local id parameter from api initialize.
...
This is always available from m_host.LocalId
2012-05-08 23:20:27 +01:00
Justin Clark-Casey (justincc)
01b78235db
Instead of constantly looking up unchanging self item in script code, pass in self item on initialization.
2012-05-08 23:05:01 +01:00
Justin Clark-Casey (justincc)
abbd050a13
Perform SceneGraph.DuplicateObject() under existing m_updateLock already used for link and delinking, in order to avoid race conditions.
...
DuplicateObject() relies on source object having correct link numbers for the duration of the dupe.
Both link and delink can change link numbers such that they are not consistent for short periods of time.
2012-05-08 21:31:35 +01:00
Melanie
05634907e9
Merge branch 'master' into careminster
2012-05-08 00:07:18 +01:00
Melanie
900afbd53e
Merge branch 'avination' into careminster
2012-05-08 00:07:13 +01:00
Melanie
d3844d142d
Merge branch 'ubitwork' into avination
2012-05-07 23:03:57 +02:00
Melanie
74eafb78eb
Fix moving no-mod objects. Fixes a regression introduced with the undo fix
2012-05-07 23:03:07 +02:00
UbitUmarov
75c51f33c4
minor change to linear motor decay
2012-05-07 21:44:24 +01:00
Justin Clark-Casey (justincc)
5d1d47e1f9
Revert "Better error handling if Load OAR or Save OAR fail"
...
This reverts commit 65c88b2ff4
.
Yet again I accidentally committed something whilst evaluating it.
2012-05-07 20:01:17 +01:00
Oren Hurvitz
15844da3af
Log the full exception when errors occur in BaseHttpServer
2012-05-07 19:56:00 +01:00
Oren Hurvitz
65c88b2ff4
Better error handling if Load OAR or Save OAR fail
2012-05-07 19:07:38 +01:00
Justin Clark-Casey (justincc)
a82dc263ab
For osGetGridNick(), osGetGridName(), osGetGridLoginURI() and osGetGridCustom(), try to read from the [GridInfoService] section on standalone rather than [GridInfo]
...
[GridInfoService] is the section that's actually in bin/config-include/StandaloneCommon.ini.example
2012-05-07 19:05:21 +01:00
Justin Clark-Casey (justincc)
5053506d88
refactor: Instead of performing a ScenePresence lookup twice over LocateClientObject() and GetClientScene(), do the lookup just once in LocateClientObject()
2012-05-07 18:27:33 +01:00
Justin Clark-Casey (justincc)
cdf97ab3a6
Fix a bug in FriendsModule.StatusNotify() where all subsequent friends would not be notified once a non-local friend was found.
2012-05-07 17:21:45 +01:00
Melanie
df7abbb367
Merge branch 'master' into careminster
2012-05-07 12:07:47 +01:00
Melanie
1120a2cf36
Merge branch 'avination' into careminster
2012-05-07 12:07:42 +01:00
dahlia
4032455332
add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for OpenMetaverse.Primitive object
2012-05-07 00:33:50 -07:00
dahlia
4186fa10f0
remove default values from prior commit since mono cant deal with them
2012-05-07 00:08:56 -07:00
dahlia
b697d0e895
add OS_NPC_RUNNING option to osNpcMoveToTarget() to allow running speed for moving NPCs
2012-05-06 23:54:50 -07:00
Melanie
b60f51dafc
Stop llSetPos from sending one update per child prim
2012-05-06 19:21:54 +01:00
nebadon
c11b3760da
just another test :)
2012-05-05 14:49:10 -07:00
nebadon
f19fe50629
never say last test!!
2012-05-05 14:45:53 -07:00
nebadon
86dd5adceb
one last test..
2012-05-05 14:42:33 -07:00
nebadon
8d070cf47b
last test clean up the mess..
2012-05-05 14:32:40 -07:00
nebadon
531c52abe3
test #2
2012-05-05 13:59:40 -07:00
nebadon
9317b888f9
testing new opensimulator.org hardware out to make sure git still works!
2012-05-05 13:49:10 -07:00
UbitUmarov
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
UbitUmarov
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
UbitUmarov
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
Melanie
b62cc3ce0a
Merge branch 'avination' into careminster
2012-05-05 10:32:22 +01:00
Melanie
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
UbitUmarov
163a86517a
force lower avatar density for testing
2012-05-05 03:28:35 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
e18686528e
Use the more efficient HashSet instead of List for FlotasmAssetCache.m_CurrentlyWriting
2012-05-04 23:03:33 +01:00
Justin Clark-Casey (justincc)
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
UbitUmarov
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
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
c84ef57e52
minor: remove mono compiler warning
2012-05-04 21:04:42 +01:00
Talun
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
Justin Clark-Casey (justincc)
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