Justin Clark-Casey (justincc)
e6fb458597
no-op change for cia.vc test
2012-08-20 22:18:29 +01:00
Justin Clark-Casey (justincc)
812c498ef4
When loading an OAR, validate any group UUIDs and properly reconstruct parcel access lists.
...
If a group UUID is present that is not on this simulator then the object or parcel is no longer group owned.
This is a change from previous behaviour where such invalid UUIDs were kept.
This is an adaptation of patch 0002 from http://opensimulator.org/mantis/view.php?id=6105 by Oren Hurvitz of Kitely.
My adaptations are formatting only, apart from the notices about parcel owner IDs not being saved since this has now been fixed.
Thanks Oren.
2012-08-20 22:01:02 +01:00
Justin Clark-Casey (justincc)
970727e57e
Tighten up OpenSim.Framework.Cache locking to avoid race conditions.
...
This is to resolve a reported issue in http://opensimulator.org/mantis/view.php?id=6232
Here, the land management module is using OpenSim.Framework.Cache (the only code to currently do so apart from the non-default CoreAssetCache).
2012-08-20 20:55:58 +01:00
Justin Clark-Casey (justincc)
bcbd450fe4
Add --force flag to "kick user" console command to allow bypassing of recent race condition checks.
...
This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once).
You should only attempt --force if a normal kick fails.
This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive.
This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
2012-08-20 20:24:54 +01:00
Melanie
9aec62f0ac
Fix scripted detach of temp attachments
2012-08-20 15:59:38 +01:00
Melanie
df3623b01d
Merge branch 'avination' into careminster
2012-08-20 15:59:28 +01:00
Melanie
7f7f005da4
Merge branch 'avination' into careminster
2012-08-20 15:58:47 +01:00
Melanie
f71ed7eb79
Fix scripted detach of temp attachments
2012-08-20 15:35:06 +02:00
Melanie
dd0556abc9
Fix llDialog responses so that they can be heard throughout the region. This now conforms to the behaviour in SL.
2012-08-19 22:05:38 +01:00
UbitUmarov
a329c77063
Merge branch 'avination' into ubitwork
2012-08-19 06:14:49 +01:00
Melanie
0a959343a5
Make the console output from the reigon console hookable
2012-08-18 22:36:48 +02:00
Melanie
2efd13ae18
Fix a typo
2012-08-18 22:36:42 +02:00
Melanie
8769e4ee73
Add a reference to OpenMetaverseType.dll to compiled script assemblies.
2012-08-18 19:08:38 +01:00
Melanie
914f97cb76
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-18 19:01:05 +01:00
SignpostMarv
d72d599056
integrating redundant code into operator
2012-08-18 18:30:00 +01:00
SignpostMarv
ca33619e11
Rot2Quaternion is now redundant
2012-08-18 18:30:00 +01:00
SignpostMarv
ffdde05bb7
constructor means not having to manually refer to individual properties
2012-08-18 18:29:59 +01:00
SignpostMarv
fb84ff96a9
implicit operators mean one does not need to instantiate new objects manually
2012-08-18 18:29:59 +01:00
SignpostMarv
52d7af05bc
adding missing refactor for LSL_Vector
2012-08-18 18:29:59 +01:00
SignpostMarv
2b0c8bc480
Implementing operators & constructors for Quaternion
2012-08-18 18:29:59 +01:00
Melanie
c153d365ed
Merge branch 'master' into careminster
2012-08-18 14:01:39 +01:00
Melanie
2a70afeca2
Fix the whitespace formatting error introduced by the last patch
2012-08-18 14:00:10 +01:00
Melanie
5d43e27de2
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-18 13:57:50 +01:00
SignpostMarv
5d7751da89
refactoring for Vector3 operator & constructor tweaks
2012-08-18 13:21:55 +01:00
Melanie
aee7a31bc3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-08-18 13:17:39 +01:00
Melanie
9d6fe1224a
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-08-18 12:57:49 +01:00
Justin Clark-Casey (justincc)
e4e5237086
When reporting a thread timeout, create a copy of the info rather than passing the original ThreadWatchdogInfo structure.
...
This is to avoid the possibility of misleading reporting if a watchdog update outraces an alarm.
Should address any remaining issues from http://opensimulator.org/mantis/view.php?id=6012
2012-08-18 00:46:34 +01:00
SignpostMarv
28d0aff2e3
adding null return to fix building
2012-08-17 23:23:03 +01:00
SignpostMarv
7068fddd2f
fixing bug that get/set the wrong property for prim types other than sphere & box
2012-08-17 23:23:03 +01:00
SignpostMarv
466d684fbe
implemented
2012-08-17 23:23:03 +01:00
SignpostMarv
74f5253a36
attempt to handle InvalidCastException in a manner similar to Second Life
2012-08-17 23:08:24 +01:00
Justin Clark-Casey (justincc)
3ad827174e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-17 22:50:54 +01:00
Justin Clark-Casey (justincc)
56da788243
Add information to ThreadStackSize about possibly increasing if suffering StackOverflowExceptions during script conversion/compilation (e.g. on Windows 64-bit)
2012-08-17 22:50:11 +01:00
Robert Adams
7243d4f842
BulletSim: Properly regenerate hulls when objects made physical.
...
This fixes the problem of non-base shapes (cubes and spheres)
falling through the terrain.
2012-08-17 14:45:18 -07:00
Justin Clark-Casey (justincc)
f57c1ac386
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-17 22:31:58 +01:00
Justin Clark-Casey (justincc)
0860a0d856
minor: Make xengine debug message on script load a scripting loading message instead.
...
This is more useful if compilation fails due to an uncatchable exception since we know what was being compiled.
2012-08-17 22:30:01 +01:00
Robert Adams
03d76e9403
BulletSim: restore most of the Detail logging statements. Will have
...
no effect on non-logging running.
Capture region name that is passed to the physics engine and use
it for detail logging file name prefix.
Fix problem with avatars dropping when flying across region boundries.
2012-08-17 13:34:22 -07:00
Robert Adams
5c192b9bab
Modify order of code so SOP doesn't set the physics actor flying
...
property multiple times every time Update is called.
This eliminates zillions of settings which is better for BulletSim.
The should be no functionality change.
2012-08-17 13:34:20 -07:00
Robert Adams
ccc69d66a1
BulletSim: add parameters and functionality to specify the mesh
...
level of detail for large meshes.
Remove parameter and code for DetailLog (conditional logging into
regular log file).
2012-08-17 13:34:18 -07:00
Robert Adams
8eda290262
BulletSim: comments and parameter changes in dynamics engine.
2012-08-17 13:34:16 -07:00
Robert Adams
e31e23d68d
BulletSim: in BSDynamics, merge 'flags' and 'hoverFlags' as they are defined for the same bits and it makes the code less complicated.
2012-08-17 13:34:14 -07:00
Justin Clark-Casey (justincc)
99e339dd40
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-08-17 18:48:35 +01:00
SignpostMarv
e9ea911563
adding a clip method to handle Vector3 objects to enable a minor amount of refactoring
2012-08-17 18:40:49 +01:00
UbitUmarov
f9a318380b
let setLinkPrimParams terminate even if there are no more parts.
2012-08-16 22:14:56 +01:00
UbitUmarov
db3f0a3748
fix vs2010 build
2012-08-16 15:26:16 +01:00
Melanie
90ad98370a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-16 02:46:48 +01:00
Melanie
9995421df1
Do a proper null check to avoid the overloaded operator == trap
2012-08-16 02:35:03 +01:00
Robert Adams
57a9879669
Correct an exception report in SceneObjectPart so it outputs the stack.
2012-08-15 16:39:00 -07:00
Robert Adams
376441e550
BulletSim: make it so objects in a linkset do not generate collisions with each other.
2012-08-15 16:29:50 -07:00
Robert Adams
ae5db637f2
BulletSim: update DLLs and SOs to fix the problem with avatars jumping around at altitudes less than 25m.
2012-08-15 16:29:46 -07:00