fca8c82232
Move KeyframeMotion from SOG to SOP because we can't persist it any
...
other way because SOG doesn't technically exist in the DB
2012-02-26 18:11:38 +01:00
ac1e30156a
Implement proper selection behavior
2012-02-26 15:09:00 +01:00
416f39a561
Implement KeyframedMotion selection behavior
2012-02-26 15:06:05 +01:00
8cdc115c91
Fix deserialization of Buoyancy, Force and Torque. Remove debug from the new
...
code.
2012-02-26 14:30:24 +01:00
9a15bba99b
Fix an infinite recursion caused by checking the wrong values for
...
Buoyancy, Force and Torque
2012-02-26 13:31:29 +01:00
aa552d0526
Serialize Keyframe motion for region crossings
2012-02-26 12:29:35 +01:00
142f8a4aec
HG: Remove async in posting assets to foreign grid. Mono hates concurrency there.
2012-02-25 21:00:19 -08:00
edc78defed
Zero force and torque on take so that items don't run away when rezzed
2012-02-26 02:52:08 +01:00
e9120890a2
Merge branch 'ubitwork'
2012-02-26 02:41:41 +01:00
c82709c0d6
Implement llSetKeyframedMotion. No persistence, no region crossing. Yet.
2012-02-26 02:36:34 +01:00
e07440d0c5
changed SOP Force and Torque, adding XML (de/)serialization, also changed Buoyance. PLEASE trap deserialization from inventory etc, making force and torque vector3.Zero, unless we want then to rez moving. (needs checking/testing as usual)
2012-02-25 22:20:25 +00:00
4177571a78
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_support
2012-02-25 14:33:56 -05:00
6386fdcda7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
2012-02-25 16:24:01 +00:00
01f454242d
PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implemented
...
http://opensimulator.org/mantis/view.php?id=5763
2012-02-25 15:33:33 +00:00
5eb1679367
Delay the sending of the initial werables update until the inventory and
...
VFS in the viewer are ready. We're much faster than SL and that exposes this
race condition. Also reinstate the extra avatar data send on login
2012-02-25 12:25:16 +01:00
b48b0b1e58
Remove EXPERIMENTAL tags from load iar/save iar commands.
2012-02-25 00:48:41 +00:00
7b5e42c744
llGetLinkMedia, llSetLinkMedia, llClearLinkMedia implementation mantis: http://opensimulator.org/mantis/view.php?id=5756 http://opensimulator.org/mantis/view.php?id=5755 http://opensimulator.org/mantis/view.php?id=5754
2012-02-24 23:10:41 +00:00
70b4bc8cf5
Merge branch 'ubitwork'
2012-02-24 19:48:39 +01:00
23679c3808
replace bad meshs by a small cube and log it.
2012-02-24 20:34:11 +00:00
991826ca76
Try not to send the avatar updates on login. This may mean loggin in with
...
invisible attachments again but could help the appearance issues.
2012-02-24 19:31:27 +01:00
ec94b82f51
stop using useless geom tricallback.
2012-02-24 18:25:43 +00:00
95f43ab73e
Add a cache on GridService requests
2012-02-24 18:17:30 +01:00
37068d17c5
Merge branch 'master' into careminster
2012-02-24 09:56:06 +00:00
bafef292f4
Take watchdog alarm calling back outside the m_threads lock.
...
This is how it was originally. This stops a very long running alarm callback from causing a problem.
2012-02-24 05:25:18 +00:00
9e6ffe7798
Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually returns and for consistency.
2012-02-24 05:15:47 +00:00
84735b644c
Get rid of some of the identical exception catching in Scene.Update().
2012-02-24 05:12:56 +00:00
f67f37074f
Stop spurious scene loop startup timeout alarms for scenes with many prims.
...
On the first frame, all startup scene objects are added to the physics scene.
This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame.
This commit also slightly changes the behaviour of timeout reporting.
Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check.
Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
2012-02-24 05:02:33 +00:00
fe229f10e6
In osSetSpeed(), if no avatar for a uuid is found then don't attempt to set speed.
2012-02-24 04:08:59 +00:00
0b9f4d7e74
llLinkSitTarget implementation http://wiki.secondlife.com/wiki/LlLinkSitTarget
2012-02-24 00:58:11 +00:00
f034958bdc
Load appropriate 32-bit/64-bit Windows sqlite dll if using WebStatsModule.
...
This should resolve http://opensimulator.org/mantis/view.php?id=5901
2012-02-23 23:11:47 +00:00
daf58575f8
Partially apply the core banlines fix
2012-02-23 23:05:04 +00:00
90ea00a109
Try to resolve some problems with viewers crashing after hitting parcel banlines or freezing on the banline.
...
This involves
1) On forcible teleport, call m_scene.RequestTeleportLocation() rather than ScenePresence.Teleport() - only EntityTransferModule now should call SP.Teleport()
2) When avatar is being forcibly moved due to banlines, use a 'stop movement' tolerance of 0.2 to requested position rather than 1
This prevents the avatar sometimes being stuck to banlines until they teleport somewhere else.
This aims to fix some problems in http://opensimulator.org/mantis/view.php?id=5822
2012-02-23 22:56:42 +00:00
e74bf46007
Prevent a nullref when nonphysical motion objects cross sim boundaries
2012-02-23 23:18:01 +01:00
7c520cf531
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-23 22:27:20 +01:00
1c0adfa6e0
Correct sit position calculations
2012-02-23 22:26:17 +01:00
f3ea2bde61
Fix preserving the animation state of a crossing seated avatar
2012-02-23 20:32:35 +01:00
dc835717d6
Properly sequence updates of avatars and attachments so that we don't
...
update attachments on child avatars or intermingle agent and attachment
updates, which would render the root prim of huds invisible
2012-02-23 14:08:35 +01:00
f266c54f82
Merge branch 'ubitwork'
2012-02-23 13:10:02 +01:00
56cc573d2f
Show avatars as sitting on proot prims only to avoid motion jitter
...
for passengers
2012-02-23 12:20:20 +01:00
af377470e1
Merge branch 'master' into v3_support
2012-02-22 22:29:30 -05:00
e827bcaf2b
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-23 02:04:16 +00:00
f1a76195ea
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2012-02-23 01:49:14 +00:00
9ed4245d9e
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-02-23 01:42:08 +00:00
1dfc990264
Add a position parameter to region crossing of objects. This avoids the
...
potential bad update that places an object at the opposite side of the
origin sim for a moment before actually crossing it. Especially important in
grids like OSG where lag between sims is high.
2012-02-23 01:40:30 +00:00
15bc539bd4
fix the last fix. Regions are square but... Also remove the 0.5 offset in map position. It was apparently needed to fix we having nsamples = size and not size + 1.
2012-02-23 00:50:07 +00:00
aa77d1d486
fix my bug on ChODE terrain heightmap build
2012-02-23 00:22:44 +00:00
c0b8f3d0bc
Add permission checks to scripted object movements, which didn't respect bans
...
and parcel settings until now. Add llSetRegionPos() function according to
LL spec
2012-02-23 00:08:31 +01:00
3796e08b59
Count agents for LSL instead of relying on SceneGraph to have the correct
...
value. Fixes a reported glitch.
2012-02-22 23:14:29 +01:00
165ae251ec
V3 Support
...
The V3 webapps need SSO capability and use OpenID. We need to send both our OpenID server url and a token for the user in the login response.
2012-02-22 16:36:28 -05:00
1e1270166f
Adjust sit target and the llSetLinkPrimitiveParams sit position hack
...
to match SL.
2012-02-22 20:40:44 +01:00
5d31267185
Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in constructor and never subsequent set to null.
2012-02-22 00:55:16 +00:00
65f5f60317
Merge branch 'master' into careminster
2012-02-21 23:43:39 +00:00
cf9b3e7708
Restore the taskItem null check that I accidentally blatted in 5397a6d
...
This is a valid check because the caller could supply an invalid uuid.
2012-02-21 23:41:48 +00:00
1273ec6c7d
Merge branch 'master' into careminster
2012-02-21 23:17:39 +00:00
1c533eb520
Fix:LINK_ROOT flag for llGetLinkName() by SinglePrim
2012-02-21 23:15:33 +00:00
5397a6d4c6
Fix problem with dragging child part inventory item to user inventory.
...
This fixes the problem by fixing the permissions module to look at root part permissions rather than having to do this for every caller.
Resolves http://opensimulator.org/mantis/view.php?id=5569
2012-02-21 22:54:30 +00:00
24a49011cb
Merge branch 'master' into careminster
2012-02-21 22:54:00 +00:00
76f411147d
Revert "Fix:Cannot drag inventory from child prim into inventory http://opensimulator.org/mantis/view.php?id=5569 "
...
This reverts commit 15ce73cacahttp://opensimulator.org/mantis/view.php?id=5569 , I was going to fix this in a more general way.
2012-02-21 22:49:06 +00:00
15ce73caca
Fix:Cannot drag inventory from child prim into inventory http://opensimulator.org/mantis/view.php?id=5569
2012-02-21 22:07:12 +00:00
cb4509f3b8
Reverse the changed to ODE heightmap. It results in SERIOUS issues like an
...
irreversible y-flip and holes in the map.
2012-02-21 21:34:02 +01:00
dede31174e
Merge branch 'master' into careminster
2012-02-21 22:08:34 +00:00
7cf970fb27
V3 Support:
...
This starts V3 support by adding a profile server url to the login response. This requires viewer support - which is also being worked on.
2012-02-21 14:21:03 -05:00
0e4d5a4d3c
Also preserve angular velocity on crossing.
2012-02-21 10:10:04 +01:00
03e7bc1526
Merge branch 'master' into careminster
...
Conflicts:
2012-02-21 10:20:56 +00:00
daee2eda93
Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate.
...
This uses the same approach as ODE.
radams, if this doesn't work for you please feel free to revert.
2012-02-21 04:10:39 +00:00
68a4ef5ef6
Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.
2012-02-21 02:52:20 +00:00
90dc5f47e7
Fix bug where NPCs would establish child agents on other neighbour regions that had come up after the NPC was created.
2012-02-21 01:57:19 +00:00
19d271d3fc
Remove PhysXPlugin and wrappers.
...
In over 4 years this never progressed beyond an unimplemented stub.
This doesn't mean that it can't come back if someone is interested in implementing PhysX support.
2012-02-21 01:45:17 +00:00
ee62bf3c69
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-20 20:23:14 +01:00
3b2900e884
Merge branch 'master' into careminster
2012-02-20 19:48:28 +00:00
4a329098e8
Amend to last commit: synchronize access to queues.
2012-02-20 11:12:02 -08:00
99b9c1a9d5
More improvements on agent position updates: if the target sims fail, blacklist them for 2 min, so that we don't keep doing remote calls that fail.
2012-02-20 10:58:07 -08:00
d6b8febbf4
Make vehicles retain velocity when crossing between regions.
2012-02-20 19:49:01 +01:00
8f8206f478
Add an override to make SOG.Velocity work as expected
2012-02-20 16:55:12 +01:00
1c3ee5d1ce
One more tweak related to the previous 2 commits.
2012-02-19 16:42:01 -08:00
b489c85226
Amend to last commit. This should have been committed too.
2012-02-19 15:37:37 -08:00
dcea23906b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-19 12:28:47 -08:00
20c65ac438
A few more tweaks on position updates and create child agents. Mono hates concurrent uses of the same TCP connection, and even of the connections to the same server. So let's stop doing it. This patch makes movement much smoother when there are lots of neighbours.
2012-02-19 12:28:07 -08:00
77575ec51b
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-19 20:36:26 +01:00
756baff86a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2012-02-19 21:14:18 +00:00
4bc3a0ecf4
Uncomment serialization
2012-02-19 20:25:20 +01:00
433d5f1d3e
Merge branch 'ubitwork'
2012-02-19 20:24:00 +01:00
3c9b7f2c0c
simplified vehicle fromXml. Use still comented on SceneObjectSerialized.cs
2012-02-19 19:27:01 +00:00
96409cc2ee
Merge branch 'ubitwork'
...
Conflicts:
OpenSim/Region/Physics/ChOdePlugin/ODEPrim.cs
OpenSim/Region/Physics/ChOdePlugin/OdePlugin.cs
2012-02-19 20:08:01 +01:00
60d68ee312
Vehicle XML serialization more complete. Inactived by coments in SceneObjectSerializar.cs until proper testing
2012-02-19 18:10:00 +00:00
bcb9577495
Use localy defined name, TPFlags, for Constants.TeleportFlags
2012-02-19 12:09:57 -05:00
488ec59408
Merge branch 'master' into careminster
2012-02-19 14:57:51 +00:00
b77d354e6d
moved vehicle from SOG to SOP
2012-02-19 13:21:01 +00:00
185bf55804
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-19 14:20:53 +01:00
d22715126c
Fix:Fly setting for Parcel dosen't work http://opensimulator.org/mantis/view.php?id=5887
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-02-19 01:58:28 -07:00
a114367b9b
Fix:OmegaX, OmegaY and OmegaZ not saved for child prims http://opensimulator.org/mantis/view.php?id=5893
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-02-19 01:00:01 -07:00
2ffc055f7e
This should smooth movement in heteregeneous networks by a lot: cache the region by position instead of looking it up all the time -- this was being done during the main update loop!
2012-02-18 21:59:42 -08:00
736fb0b41d
minor fix to chODE terrain heighmap scale
2012-02-19 02:07:43 +00:00
985526b662
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
2012-02-18 22:21:10 +00:00
7a1ab03b75
missing paramenters init plus some cleaning
2012-02-18 19:31:36 +00:00
a62baf8ea4
added a EnUsCulture whatever that is..
2012-02-18 18:37:29 +00:00
028dc1f4ed
a bit less human readable xml
2012-02-18 18:33:41 +00:00
70b3b599bc
added some ToXml2 to SOGVehicle ( unused untested )
2012-02-18 18:25:48 +00:00
3aee642190
changed how vehicle data is stored and passed to physics. use unsafe in serializer, tried to control m_dupeInProgress
2012-02-18 17:42:14 +00:00
91a326331f
vehicle parameters do cross (i hope) on regions in same instance ( others need xml)
2012-02-18 16:16:48 +00:00
5351ff925c
let SOG know about vehicles. Still needs serialization and applyphyscis on deserialize, etc
2012-02-18 14:08:42 +00:00
14e9bf894c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-18 00:51:23 -05:00
f4cd35322f
Route logins according to Estate, Telehub and TeleportFlags
2012-02-18 00:45:43 -05:00
7bdcf9eb26
Propagate our teleport flags on logins
2012-02-18 00:32:09 -05:00
9846a1e56e
Report an error if the required native Windows ODE library can't be found.
2012-02-18 02:52:29 +00:00
fbccff4994
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-17 21:15:18 -05:00
84184708de
Fix a bug where changing shape parameters of a child prim in a linkset would not persist.
...
Resolves http://opensimulator.org/mantis/view.php?id=5819
2012-02-18 01:15:43 +00:00
8f8b478d36
Parcel sales support to SQLite
2012-02-17 20:04:38 -05:00
b817c337dc
On Windows automatically load the correct native ODE library depending on whether the process is 32-bit or 64-bit
...
In theory, this means that a 64-bit Windows OS user can now run OpenSim.exe with ODE and use more than 2 (or 3) GB of memory.
However, this is completely untested since I don't currently own a 64-bit Windows box. Feedback appreciated.
Using OpenSim.32BitLaunch.exe should continue to work. Other platforms are unaffected.
This will currently not work with sqlite - I will add that too if this works.
2012-02-18 00:33:52 +00:00
d03e878d53
Fillin missing SQLite support for Telehubs
2012-02-17 17:31:20 -05:00
b313d16493
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-17 13:51:54 -08:00
784263f5e3
Added the TriggerAvatarAppearanceChanged to EventManager. It's triggered by AvatarFactoryModule after an avatar's appearance has been succesfully changed and persisted (if the persist option is set).
2012-02-17 13:45:45 -08:00
7d77ccc659
Added simple binary serializer/deserializer to chODE. 100% untested and most like still broken
2012-02-17 21:09:00 +00:00
6baa13ab7a
Add new and updated script events
2012-02-17 09:12:41 -08:00
0e16e0fb6a
Merge branch 'master' of /home/opensim/src/opensim
2012-02-17 08:21:33 -05:00
ba98d6fffe
Fix missing telehub handling on login
2012-02-17 08:03:53 -05:00
972f73ed2b
Make osNpcStopAnimation() call AvatarStopAnimation() rather than AvatarPlayAnimation()
2012-02-17 02:53:12 +00:00
c5ff37bf3e
Merge branch 'master' of /home/opensim/src/opensim
2012-02-16 09:01:02 -05:00
6b867773a8
Remove some debugging output form the logger
2012-02-16 08:59:34 -05:00
912aac3447
minor formatting changes from last commit (4486n7d)
2012-02-16 03:37:40 +00:00
4486b7d8e8
Fix: Object owned by the group does not return to the last owner http://opensimulator.org/mantis/view.php?id=5404
2012-02-16 03:35:18 +00:00
1267094a51
Turn off logging on test in last commit ( 2b84295).
2012-02-16 03:02:11 +00:00
2b842958cc
If shape properties fail SOP parsing (e.g. due to commas instead of decimal points) print out one short message listing the failing node names rather than lots of exceptions.
...
Adds skeleton bad float values deserialization test
2012-02-16 02:58:00 +00:00
80ec2ac167
Correct a bug introduced in 1f402fdf (Feb 7 2012) where the delete friends grid call would try and contact the wrong uri. Also fixes the build from df960d5
2012-02-16 01:39:12 +00:00
df960d5767
Add known identity informatio nto log message if an exception is thrown during LLUDPServer.HandleUseCircuitCode()
2012-02-16 01:25:54 +00:00
0c1074537b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-02-16 00:38:04 +00:00
c0760f9f91
Comment out "experimental" log message printed out whenever a physics mesh was generated for a mesh
...
Also adds prim name to the "no asset data" error log message
2012-02-16 00:28:57 +00:00
c906128191
Fix some logic mistakes where firstly osNpcCreate() without options was creating npcs sensed as agents and secondly the OS_NPC_SENSE_AS_AGENT option was having the opposite effect.
...
Hopefully makes progress on addressing http://opensimulator.org/mantis/view.php?id=5872
2012-02-16 00:22:39 +00:00
819fcdaee1
Now if chode prim.cs detects out of bounds it requests a update and blocks movement and colisions. Base code must do a PhysActor.CrossingFailure() to make it move again inside sim or delete it.
2012-02-15 22:04:26 +01:00
3bffdddc9d
don't freeze with a sitted avatar in a border without other sim. Still messy :(
2012-02-15 22:04:17 +01:00
f6c35cf26f
Now if chode prim.cs detects out of bounds it requests a update and blocks movement and colisions. Base code must do a PhysActor.CrossingFailure() to make it move again inside sim or delete it.
2012-02-15 20:33:31 +00:00
b59275355e
don't freeze with a sitted avatar in a border without other sim. Still messy :(
2012-02-15 19:44:54 +00:00
a758abaa9f
try to make crossings work better. chode no longer prevents crossings i hope
2012-02-15 17:08:33 +00:00
f6f0d884bd
try to make crossings work better. chode no longer prevents crossings i hope
2012-02-15 16:44:15 +01:00
04279e36d1
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-15 03:51:30 +00:00
f574d3c8fc
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-15 01:50:57 +00:00
ebe5e1731d
In ObjectTortureTests, run garbage collector on Teardown and run scene loop update when scene objects have been deleted.
...
At least on mono 2.6.4, running GC.Collect() is not guaranteed to force gc of all objects when run in the same method where those objects had references.
Therefore, GC.Collect() is now being done in the per-script teardown of ObjectTortureTests.
In addition, scene loop update is being run after garbage collection in order to clean out the viewer update list of scene objects in the SceneGraph.
These measures mean that scene objects/parts are now garbage collected after a test run if deleted from the scene, resulting in a much better memory usage report (though probably still not very accurate).
However, deletion takes a very long time - what's really needed is to find out now why the entire scene isn't being GC'd by this measure.
This change hasn't yet been applied to the other stress tests.
2012-02-15 01:45:25 +00:00
2ebb421331
Refactor appearance saving for NPC to use AvatarFactoryModule interface.
2012-02-14 17:20:34 -08:00
7be9ba5564
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-02-15 01:11:35 +00:00
272ba5a741
Merge branch 'master' into careminster
2012-02-15 01:11:17 +00:00
2d3381b795
Implement region crossing of sitting avatars. Edit mode and llSetPos work
...
but unscripted default sit anim is lost. Still some Gfx glitching. Physical
crossing doesn't work yet.
2012-02-14 23:16:20 +01:00
a9e8bd59a3
Fix a race condition in the simian groups connector. When requests were
...
too slow they would circumvent the cache (piling up on the network service
and making the problem even worse). This condition happens frequently
during permission checks.
2012-02-13 19:38:22 -08:00
4589ce61bc
Fix: get embedded objects from Notecard fails with activated FreeSwitchVoiceModul
...
http://opensimulator.org/mantis/view.php?id=2607
2012-02-14 02:12:12 +00:00
33e66107be
Fix: Lightshare Module(Windlight)-Region settings are not applicable for database sqlite mantis: http://opensimulator.org/mantis/view.php?id=5888
2012-02-14 02:06:42 +00:00
db90dea9bd
Fix: MSSQLDB Grid - unable to register region http://opensimulator.org/mantis/view.php?id=5886
2012-02-14 02:04:02 +00:00
04544b4510
Revert "Add GridStore migration for MSSQL."
...
This reverts commit 0b17a66e68
2012-02-14 02:03:23 +00:00
0b17a66e68
Add GridStore migration for MSSQL.
...
This is done blind since I don't use MSSQL. If this doesn't work, then one will have to wait for it to be updated for the 0.7.3 opensim release.
2012-02-14 02:02:11 +00:00
04986bbb15
Add some more data to the new user connection logging for debug purposes.
2012-02-14 01:50:51 +00:00
e321306517
Prevent object loss and positioning outside the region with failed object sim
...
crossings
2012-02-14 00:02:53 +01:00
04a195266b
short circuit the expensive parts of the permission checking code
...
if the current user is the owner of an object. none of the later
checks can reverse the outcome.
2012-02-13 13:21:42 -08:00
21393af631
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-13 20:48:50 +00:00
189c67db95
On object deserialization, go back to logging errors at DEBUG level rather than ERROR. Restore extra log message if shape processing fails.
...
Logging level was DEBUG before 312e145312e145
2012-02-13 20:43:26 +00:00
6fd6919a0b
remove drawstuff from ubitode
2012-02-11 19:25:41 +00:00
f168fefb79
removed outdated coments.
2012-02-11 19:14:27 +00:00
bcf59a574f
remove forgotten taints code
2012-02-11 19:12:04 +00:00
09f6647aa3
scenepresence change! in standup() give avatar a physical actor after deciding the new position. This reduces a bit the odds of it being still coliding with object.
2012-02-11 17:48:49 +00:00
022ae33ed5
UbitODE: replace 'taints' by 'changes' for avatars also. This provides better time order with changes in prims.
2012-02-11 17:35:38 +00:00
d4e28ed113
vehicle changes done by simulation thread and not calling one
2012-02-11 15:18:13 +00:00
3f9c390b4d
changes to vehicle banking
2012-02-11 14:29:36 +00:00
33a9f0f1c5
a bit better vertical attractor and banking
2012-02-11 04:42:45 +00:00
f415256e0b
Use mesh to estimate real center of prims if avaiable. Let sculpt map textures with alpha channel work. On linux J2DecodeCache folder must be deleted to remove bad entries. Corrently this can't be cached on linux (mono/ cairo/? problem)
2012-02-11 03:25:17 +00:00
b617411b97
scale avatar push force with avatar density
2012-02-11 02:48:38 +00:00
b92b9228ef
correct the default avatar_terminal_velocity value that I accidentally left in whilst testing
2012-02-11 02:29:07 +00:00
f49897a419
Clamp ODE character velocity. Make ODE falling character 54m/s by default.
...
If velocity reaches 256 in any vector then bad things happen with ODE, so we now clamp this value.
In addition, a falling avatar is clamped by default at 54 m/s, which is the same as a falling skydiver.
This also appears to be the value used on the linden lab grid.
This should resolve http://opensimulator.org/mantis/view.php?id=5882
2012-02-11 02:28:40 +00:00
aab30f5e67
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-11 00:11:28 +00:00
e7fd732209
Make ScenePresence.MovementFlag a private only settable value to reduce complexity of code analysis
2012-02-11 00:10:59 +00:00
acfe7e555e
Merge branch 'master' into careminster
2012-02-10 23:59:10 +00:00
5023cc86f0
Change parser to leave embedded quotes alone if the pattern is recognized
...
as an OptionSet long option
2012-02-10 23:58:39 +00:00
4455140f30
Change parser to leave embedded quotes alone if the pattern is recognized
...
as an OptionSet long option
2012-02-10 23:52:06 +00:00
43a74d8481
test on git
2012-02-10 23:51:55 +00:00
71e484516a
minor: Remove warning from RegionInfo due to repeated config.GetString() call where the first was unused.
2012-02-10 23:41:14 +00:00
38f878952c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-10 23:39:59 +00:00
d80422eba7
Add line numbers to Util.PrintCallStack()
2012-02-10 23:39:32 +00:00
e3f5fd81f1
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
prebuild.xml
2012-02-10 23:03:30 +00:00
7cf73cb92a
Changes to vehicles code etc. Includes some debug aids to remove later.
2012-02-10 22:43:51 +00:00
ee078f717a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-10 16:28:11 -05:00
73f34de1f9
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-02-10 16:27:14 -05:00
b3d152f3ba
Fix an npc delete race condition with LSL sensors where an initial presence check could succeed but then the npc removed before the subequent npc check.
...
The resulting null would cause an exception. We now check for null before looking at SenseAsAgent.
Hopefully fixes http://opensimulator.org/mantis/view.php?id=5872
2012-02-10 21:26:05 +00:00
a7dc7e636e
Fix: Covenant view fails after updates or cache-clean see mantis http://opensimulator.org/mantis/view.php?id=2879
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-02-10 15:45:03 -05:00
44d84bc277
Fix bug where somebody taking a copy of an object they didn't own that was rezzed before the region was restarted would wrongly place the copy in the object owner's inventory.
...
Addresses http://opensimulator.org/mantis/view.php?id=5825
2012-02-10 19:58:34 +00:00
215acbcc96
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-02-10 10:20:51 +00:00
7273e05995
Fix: Unable to remove AV from friend list (sqldb-bug) http://opensimulator.org/mantis/view.php?id=3731
2012-02-10 02:30:55 +00:00
ddca5347c3
When an asset is uploaded (e.g. a mesh) set individual copy/move/transfer permissions, not PermissionMask.All
...
Setting PermissionMask.All will cause next permissions to replace current permissions when the object is rezzed, since bit 4 will be set.
This is not correct behaviour for a freshly uploaded mesh. Freshly rezzed in-world prims also do not have bit 4 set (don't yet know exactly what this is).
Should resolve http://opensimulator.org/mantis/view.php?id=5651
2012-02-10 02:13:15 +00:00
9c84a8162f
If NPCModule.CreateNPC() fails to create the required ScenePresence (which should in theory never happen), don't add the NPC to the npc list but return UUID.Zero instead.
2012-02-09 01:17:59 +00:00
16c4636048
Add NPC torture tests for 100, 1000 and 2000 create and delete NPC calls.
2012-02-09 00:38:09 +00:00
7c888f6af1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2012-02-09 00:19:37 +00:00
dbe32a1f6d
minor: put in commented out logging statements for future reuse
2012-02-09 00:10:45 +00:00
6af01f6767
initial introdution of physics actor building control.
2012-02-08 23:14:53 +00:00
dfa19e23f0
Stop a scene object from attempting to link with itself (which results in an exception and constant complaints in v3 viewers).
...
Aims to address http://opensimulator.org/mantis/view.php?id=5878
2012-02-08 22:19:34 +00:00
6cc9aa30ac
first change in SOP. in AddPrimShape(..) give physics the world rotation and not local offset. Currently physics interface only knows about world frame
2012-02-08 15:45:44 +00:00
c75fa8b8a1
changes in physics manager, needed for UbitODE
2012-02-08 15:28:13 +00:00
815f3af1d7
UbitODE plugin initial commit
2012-02-08 15:24:10 +00:00
9c6ba8d18f
Push more NPC stuff into threads
2012-02-08 13:04:23 +01:00
bef2a368f4
Make WebStats logging report consistently as WEB STATS MODULE instead of VC, VS and WEBSTATS
2012-02-07 23:38:53 +00:00
236e1c45f2
Merge branch 'master' into careminster
2012-02-07 23:30:48 +00:00
c87751a822
Add start GC memory and end GC memory to object stress test printouts.
...
This illustrates that references to Scene, SOG, etc. are not currently being released when a stress test ends (or at regression test end in general).
This means even the current stress tests take much more memory than they need, a problem that will have to be addressed.
2012-02-07 23:03:53 +00:00
1f402fdf5e
Add url to logging if SynchronousRestFormsRequester.MakRequest() throws an exception in service connectors
2012-02-07 21:40:28 +00:00
bd928218dd
Add TestAddTaskInventoryItem()
2012-02-07 21:00:47 +00:00
7583768b9e
Remove debug logging if physics actor is null in SOP.ApplyPhysics()
...
This is not valid in the case of BasicPhysics which can return a null PhysicsActor (though I think it should really return a do-nothing PhysicsActor).
2012-02-07 20:26:26 +00:00
de255321f1
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-02-07 20:52:04 +01:00
37049180f6
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-02-07 21:09:04 +00:00
c22970448f
Add TestCompileAndStart100Scripts() torture test.
2012-02-07 19:42:32 +00:00
038d1bf742
Add a regression test to compile and start a script. Remove Path.GetDirectoryName when getting assembly loading path in Compiler.CompileFromDotNetText().
...
The Path.GetDirectoryName call in Compiler.CompileFromDotNetText is unnecessary since AppDomain.CurrentDomain.BaseDirectory is always a directory.
Later path concatenation is already done by Path.Combine() which handles any trailing slash.
Removing Path.GetDirectoryName() will not affect the runtime but allows NUnit to work since it doesn't add a trailing slash to AppDomain.CurrentDomain.BaseDirectory.
2012-02-07 17:44:37 +00:00
a829f20828
Experimental. Expand Fire & Forget for NPC delete
2012-02-06 22:26:25 +01:00
54fc78013d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-02-05 20:58:04 +00:00
130b1c0665
Revert my two quick fixes for the lag issue and put in the real fix, which
...
is to only write to the database if data was changed. I was writing to the db
on every step of every avatar. Sure to give us lag, that.
2012-02-05 20:47:02 +00:00
a5fcdde179
Revert "Remove checks on ban list expiry on every move. To be re-added on parcel"
...
This reverts commit 35f14a262d
2012-02-05 20:12:45 +00:00
0904772a6f
Revert "Check ban list for a particular parcel only when an avatar moves into it."
...
This reverts commit 8923ad755d
2012-02-05 20:12:35 +00:00
4e11983c7c
Make configuration uniform
...
Pickup the max physical prim size in Scene to make it uniform since adding code to get default size from the OpenSim*.ini.
2012-02-05 12:38:20 -05:00
8923ad755d
Check ban list for a particular parcel only when an avatar moves into it.
...
This restores functionality remove in the last commit without reintroducing
the performance penalty.
2012-02-05 04:03:32 +00:00
35f14a262d
Remove checks on ban list expiry on every move. To be re-added on parcel
...
boundary crossing only as soon as I'm properly awake. This should fix
recent performance issues
2012-02-05 03:44:15 +00:00
13999dfc1d
Set PhysPrimMax default to 0 so ini files won't be overridden
2012-02-04 21:52:55 -05:00
36ed0dcdaa
change NonPhysicalPrimMax to NonphysicalPrimMax in Scenes.cs to make the
...
variable in OpenSim.ini and Regions.ini match
2012-02-04 19:45:10 -07:00
df07b97abd
Make NonphysicalPrimMax setting work properly
...
RegionInfo setting will override only if it is > 0
2012-02-04 21:30:16 -05:00
43b4e4cfc3
Quiet the map module logging
2012-02-04 19:08:52 -05:00
ce5e900721
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-02-04 11:48:20 +00:00
6034e5d112
Add default value to TelehubObject
2012-02-04 00:28:22 -05:00
8779ff3c8f
Supply correct parameters to detailed authentication login fail message
2012-02-04 02:00:35 +00:00
edc11a1d39
Add missing RCERR_UNKNOWN and RCERR_SIM_PERF_LOW LSL constants that would eventually be used by llCastRay(), though OpenSim does not use these yet.
2012-02-04 01:04:00 +00:00
09d6521361
Correct RC_* LSL constants used by llCastRay().
...
Many thanks to WhiteStar for doing the research on this.
2012-02-04 01:00:11 +00:00
6c252a0fa1
Add TestRegionSettingsDeserialize
2012-02-04 00:55:03 +00:00
9b762a5a84
Only look for an uploaded transactional asset in Scene.UpdateTaskInventory if we have been passed a non-zero transaction ID.
...
This resolves the recent regression from deeb728deeb728http://opensimulator.org/mantis/view.php?id=5873
2012-02-04 00:20:27 +00:00
2b6c5fcb31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-03 23:48:12 +00:00
312e1457dd
Change SceneObjectSerializer to use common ExternalRepresentationUtils.ExecuteReadProcessors() methods.
...
Adds ability to submit a customized exception message to match logging.
2012-02-03 23:47:01 +00:00
bd9d7484f0
Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim
2012-02-04 00:39:58 +01:00
4f8f44d9c3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-03 15:21:37 -08:00
ea19e50919
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-02-03 15:21:07 -08:00
0742630d81
Merge branch 'master' of /home/opensim/src/opensim
2012-02-03 18:20:26 -05:00
107cef2b0e
Check for null scene in ScheduleFullUpdate and ScheduleTerseUpdate before triggering events on a potentially null Scene
2012-02-03 15:18:48 -08:00
ce34b359ad
Extend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene presence and population of m_avatars.
...
This is required to stop a race where the SensorRepeat module can detect an NPC avatar before m_avatars is populated.
Extending the lock is the easiest to understand solution rather than getting complicated with null checks.
Hopefully resolves http://opensimulator.org/mantis/view.php?id=5872
2012-02-03 23:04:26 +00:00
5c545d1d2e
Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?id=5869
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-02-03 18:02:51 -05:00
83ef13a79a
Changed save oar and save iar parameter -p|--profile to -h|--home, including corresponding RemoteAdmin parameter
2012-02-03 23:53:18 +01:00
6234264211
Refactor common deserialization processor code to generic method ExternalRepresentationUtils.ExecuteReadProcessors()
2012-02-03 22:45:50 +00:00
f17066b7bf
Change LandDataSerializer deserialization so that in the future it won't care about extra elements or element order.
...
This brings it into line with other deserializations such as object and will improve future backward compatibility.
2012-02-03 22:21:54 +00:00
1a18948935
Corrected console help texts for "save iar"
2012-02-03 23:04:18 +01:00
0dbfa70443
Merge branch 'master' into careminster
2012-02-03 08:47:26 +00:00
61adf36339
Commenting out new event until I can fix OpenSim tests. Currently, testing objects does not create a Scene or EventManager so triggering events crashes some tests
2012-02-02 18:19:22 -08:00
ed846f11f1
OpenSim tests do not always create an EventManager so calls to trigger events during tests must check for null EventManager
2012-02-02 18:06:34 -08:00
3257dbe76d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-02 17:44:11 -08:00
146d78edfa
ObjectAddedToScene event should be fired when duplicating objects
2012-02-02 17:41:05 -08:00
ee2b2aadc3
fix line endings
2012-02-02 17:39:05 -08:00
bce5dfe711
Merge branch 'master' into careminster
2012-02-03 00:09:05 +00:00
76a658324c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-02-03 00:07:23 +00:00
573a64ad24
Merge branch 'master' into careminster
2012-02-03 00:05:59 +00:00
574c240202
Fix test failure
2012-02-03 00:05:36 +00:00
447a66d660
Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more
...
accurately reflects the data sent by the viewer. Add times bans and the
expiration of timed bans.
Warning: Contains a Migration (and nuts)
2012-02-02 23:40:56 +00:00
54d473e200
D'oh - we want to call llGetLinkNumberOfSides() in the LSL_Stub, not llGetLinkNumber().
2012-02-02 23:35:16 +00:00
264c83aec4
Add llGetLinkNumberOfSides to LSL_Stub and ILSL_Api
...
It already existed in LSL_Api but it also needs to exist in these two other places for a script to be able to see it.
Hopefully resolves http://opensimulator.org/mantis/view.php?id=5489
2012-02-02 22:48:36 +00:00
8f8b5f9a4d
Merge branch 'master' into careminster
2012-02-02 22:36:41 +00:00
07c487a28f
Make ban, eject, freeze and the scripted versions of those work.
2012-02-02 21:36:45 +01:00
17df4185ce
Add stress tests for simple object add of 100 prim objects. Add time taken to output (this is unreliable).
2012-02-02 18:42:27 +00:00
dbf6381e34
OpenID: server connector had a copy-and-paste error that made identity queries fail.
2012-02-02 08:39:23 -08:00
fd7e82ee72
Streamline banning code using existing methods.
2012-02-02 16:51:39 +01:00
857d4e60cc
Rehook the eject and freeze events that had gotten unhooked in the merge
2012-02-02 13:46:46 +01:00
567f4c51f8
Improve reliability of script state saving by covering various saving
...
and loading scenarios which resulted in loss of continuity on item ids
2012-02-02 01:52:17 +00:00
6fe4b6fbe8
Fix remembering attachment point and position when an item is rezzed in world.
...
Also fix PRIM_LOCAL_POS returning 0 when used on child prims from a script
in the root.
2012-02-02 02:51:59 +01:00
dbc3f1ff92
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/TaskInventoryItem.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-02-02 01:53:13 +00:00
0ce9ad4a56
Add event RegionHeartbeatEnd for modules interested in coordinating activity with region heartbeats
2012-02-01 17:01:28 -08:00
c10193c72b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-01 16:25:35 -08:00
45ad9e39a6
Improve reliability of script state saving by covering various saving
...
and loading scenarios which resulted in loss of continuity on item ids
2012-02-02 01:05:14 +01:00
e5ae84b42b
Re-Add the reading of attachment data hat was lost in the merge
2012-02-02 01:04:54 +01:00
16aa00e944
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-02-01 10:08:45 +00:00
003bd9f1b3
Small optimization to last commit
2012-02-01 10:05:04 +00:00
cc1476fc36
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-02-01 09:45:42 +00:00
241ddd031f
Fix copy/paste errors
2012-02-01 09:45:15 +00:00
c08d6df7e1
Prevent a changed attachment that has been saved from being saved again.
2012-02-01 09:38:20 +00:00
fcc1fa2c32
Straighten out some attachment mess. Don't save attachment states for HG
...
visitors at all. On Leaving a sim, save only the changed ones. Don't save
all scripted stuff when leaving a sim.
2012-02-01 09:36:14 +00:00
3d7b5e5e93
HG: This hopefully fixes the HG teleports back home to OSGrid. Looks like Uri.ToString() drops the port when it's port 80.
2012-01-31 22:00:59 -08:00
99e71222f0
Lay out script status in property per row format, since getting too long for console lines.
2012-02-01 00:27:42 +00:00
e3680f216e
Add count of events queued for a particular script in "scripts show" console command
2012-02-01 00:17:02 +00:00
8b3da1bff4
Make script console commands only show for selected region.
2012-02-01 00:10:07 +00:00
437de6743c
Implement "xengine status" console command to show various xengine stats
2012-02-01 00:07:06 +00:00
f028dca711
Add "show part uuid" and "show part name" console commands.
...
These commands will display part/prim details for a given uuid or name
The "show object uuid" and "show object name" commands will now only display details for objects (i.e. not child parts in a linkset).
This is for consistency with the "delete object" commands which only delete objects, not parts.
2012-01-31 23:35:13 +00:00
996cc6097e
Implement "show object name <name>" console command to show details of an object with the given name
2012-01-31 23:21:02 +00:00
ac7cded080
Get rid of the "no objects found" feedback for now - this doesn't work well if a command is executed over multiple scenes.
2012-01-31 23:06:48 +00:00
ab89adfaef
Implement "show object uuid <uuid>" console command.
...
This will show details about a part with the given uuid if it's found.
2012-01-31 23:03:39 +00:00
647b326edc
Add more user feedback if an object isn't found for which delete was requested.
2012-01-31 22:27:05 +00:00
77b032549e
Add the name of a deleted object to the console output
2012-01-31 22:22:32 +00:00
e3e38e34c5
If a particular region is selected in the console, only try to delete objects in that region, rather than in every region on the simulator
...
The old wrong behaviour was in place before the command was extracted to a module.
2012-01-31 22:21:10 +00:00
9bd02b5da1
Move object delete commands into a commands region module, in preparation for adding similar show commands.
2012-01-31 21:57:45 +00:00
727ddffb71
Merge branch 'master' into careminster
2012-01-31 21:53:32 +00:00
2f84d5397b
minor: remove mono compiler warning
2012-01-31 21:14:09 +00:00
1505c22995
Use Environment.TickCount & Int32.MaxValue; instead of Util.EnvironmentTickCount(); when producing the threads report to reduce wraparound.
...
This matches the tickcount masking in the thread watchdog.
For some reason, Util.EnvironmentTickCount() masks ticks by 0x3fffffff instead of 0xffffffff
2012-01-31 21:09:26 +00:00
d76ca9cd93
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-01-31 20:54:04 +00:00
1b63b21a4d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
2012-01-31 20:53:49 +00:00
10b9348071
Remove scene object null check on SceneGraph.AddSceneObject(). Complain explicitly if there's an attempt to add any object with a zero UUID.
...
Callers themselves need to check that they're not attempting to add a null scene object.
2012-01-31 20:30:30 +00:00
f3780b9eae
Add torture tests to test adding 10,000, 100,000 and 200,000 single prim scene objects.
...
These can be run using the "nant torture" target. They are not part of "nant test" due to their long-run future nature.
Such tests are designed to do some testing of extreme situations and give some feedback on memory usage, etc.
However, data can be inconsistent due to different machine circumstances and virtual machine actions.
This area is under development.
2012-01-31 19:56:37 +00:00
a98a146c50
Fix:llSetText - limited text to a maximum of 254 chars
...
mantis: http://opensimulator.org/mantis/view.php?id=5867
Signed-off-by: nebadon <michael@osgrid.org>
2012-01-31 10:17:38 -07:00
c305b55012
Draw brders around parcels for sale
2012-01-31 06:31:02 +01:00
d2dfa4cfe7
Make parcel sale overlays work. No auction support.
2012-01-31 03:09:44 +00:00
71012ef883
Make parcel sale overlays work. No auction support.
2012-01-31 02:19:34 +01:00
fe0975dc24
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-30 21:39:36 +00:00
2b84b6d8b1
Use the requested sim's map, not our own
2012-01-30 21:39:12 +00:00
dbc039783b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-30 21:34:40 +00:00
a0206e5a17
Comment debug spam
2012-01-30 22:30:20 +01:00
0f181fe5d0
Fix displaying landmark and search info properly with long names
2012-01-30 22:30:02 +01:00
cfe924e4a8
Merge branch 'master' into careminster
2012-01-30 21:40:50 +00:00
e1cad4c34f
Use the requested sim's map, not our own
2012-01-30 21:38:46 +00:00
9dbb58ee8b
Merge branch 'master' into careminster
2012-01-30 21:26:47 +00:00
53c3faac5d
Patch in the rest of the maptile stuff
2012-01-30 21:24:21 +00:00
c4cc626dff
Add the needed column in the regions table and a few tweaks.
...
Warning: Contains a Migration
Warning: Cannot guarantee nut free
2012-01-30 20:34:32 +00:00
bde2ff5e78
Next step for world map overlays
2012-01-30 20:11:47 +00:00
df9c35bc0f
Some plumbing for map overlays
2012-01-30 19:46:55 +00:00
9d93c4808e
lock SceneObjectGroupsByFullID in SceneGraph.ForEachSOG() to stop failure if SceneObjectGroupsByFullID is updated elsewhere at the same time.
2012-01-30 19:21:58 +00:00
54e6b2402c
Revert "Pickup map overlay tile from RegionSettings.ParcelImageID"
...
This reverts commit 00d1c88c59
2012-01-30 12:39:08 -05:00
00d1c88c59
Pickup map overlay tile from RegionSettings.ParcelImageID
2012-01-30 11:49:22 -05:00
ad02e01e77
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-01-30 16:44:26 +00:00
1b600e7803
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
2012-01-30 16:38:11 +00:00
3de534896e
Add ParcelImageID to RegionSettings so we can have that overlay.
...
Warning: Contains a Migration.
Warning: May contain nuts.
2012-01-30 16:22:21 +00:00
9a86a713d3
Merge branch 'master' into careminster
2012-01-29 22:50:59 +00:00
5e60afe5ed
Fix llEdgeOfWorld functionality - see mantis http://opensimulator.org/mantis/view.php?id=5865
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-01-29 14:41:47 -07:00
e8b688b61f
Fix:Get embedded objects in notecard http://opensimulator.org/mantis/view.php?id=2607
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-01-29 12:40:43 -07:00
7c824f02b4
Add the ability to abort a pending restart using the viewer UI or a
...
RemoteAdmin message
2012-01-28 22:19:10 +01:00
498fe1afe7
Fix calculating land prim count type width issue
2012-01-28 21:23:54 +01:00
dac826da4e
Prevent an overlong description from messing up a ParcelInfoReply
2012-01-28 20:38:50 +01:00
f7c237c0e1
Merge branch 'master' of /home/opensim/var/repo/opensim into mapwork
2012-01-28 11:35:28 -05:00
ae057a7589
Adding our parcel's generated id to map packets
2012-01-28 10:36:39 -05:00
1a20b60d82
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-28 08:47:25 -05:00
2e31f12cf4
Send CHANGED_TELEPORT during local TP again - partially revert cf73afec35
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-01-28 08:43:58 -05:00
2ef9fd05fa
Add an overloaded SceneObjectPart.UpdateTextureEntry(Primitive.TextureEntry texEntry) for region modules
2012-01-28 02:45:13 +00:00
6fbc48ee9c
Make all NPCs owned by default
2012-01-28 03:32:25 +01:00
6db9109b3f
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-01-28 03:22:36 +01:00
abffda269f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-01-28 04:05:53 +00:00
154ba0124a
Add experimental --publish option to "save oar" so that OARs reloaded to the same grid don't have the publisher as owner.
2012-01-28 02:21:41 +00:00
fbe324cc5e
Fix build break
2012-01-28 03:15:17 +01:00
090164ff7a
Completely disable NPC being sensed as agents, the abuse potential is too great
2012-01-28 03:12:56 +01:00
428407c5e4
Merge branch 'master' into careminster
2012-01-28 01:01:23 +00:00
e391d6390c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-28 00:44:11 +00:00
deeb7287a2
Comment out xfer section in Scene.UpdateTaskInventory() which was causing spurious errors and "script saved" messages when script properties were changed.
...
Viewers since at least Linden Lab 1.23 use the script upload capability to save script changes.
It's unknown whether the commented out code was working for very old viewers or not.
Code is commented out to reduce complexity and so that useful error messages don't need to be removed.
If there is a substantial population using extremely old viewers that can't upgrade to a newer version 1 viewer (e.g. 1.23) or similar TPV then this can be revisited.
2012-01-28 00:39:53 +00:00
7352aea9ac
Remove IClientAPI from the money module. It was only used to pass in the
...
agent id anyway
2012-01-28 00:18:12 +00:00
7837c611fb
Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate().
...
This allows NPCs to be sensed as agents by LSL sensors rather than as a specific NPC type (which is currently an OpenSimulator-only extension).
Wiki doc on this and other recent NPC functions will follow soon
2012-01-28 00:00:12 +00:00
26a4e8a161
Merge branch 'master' into careminster
2012-01-27 23:30:26 +00:00
31b87ff07b
Increment LPS script stat for OSSL functions that were not already doing this
2012-01-27 23:24:49 +00:00
7c1d075a5a
Implement osIsNpc(key npc):integer. This return TRUE if the given key belongs to an NPC in the region. FALSE if not or if the NPC module isn't present.
2012-01-27 23:17:13 +00:00
abf0dd4250
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-27 23:14:34 +00:00
9939f94f08
Implement osNpcGetOwner(key npc):key. This returns the owner for an 'owned' NPC, the npc's own key for an 'unowned' NPC and NULL_KEY is the input key was not an npc.
...
llGetOwnerKey() could also be extended but this does not allow one to distinguish between an unowned NPC and some other result (e.g. 'no such object' if NULL_KEY is the return.
Also, any future extensions to LSL functions by Linden Lab are unpredictable and OpenSim-specific extensions could clash.
2012-01-27 23:05:48 +00:00
86b9e6fbed
Merge branch 'master' into careminster
2012-01-27 19:47:24 +00:00
91ac21b9ec
HG Inventoty: Guard against items not found.
2012-01-26 17:00:58 -08:00
9d60b84f78
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/EstateSettings.cs
2012-01-26 23:07:31 +00:00
6da82d9805
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-26 16:29:39 -05:00
616373db16
llManageEstateAccess implementation http://wiki.secondlife.com/wiki/LlManageEstateAccess
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-01-26 16:15:23 -05:00
7229f6e64b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-01-26 10:32:22 +00:00
da720ce9be
Support rejecting a teleport if a user is banned in all parcels that have
...
spawn points
2012-01-26 10:21:45 +00:00
a537f7e1a3
Merge branch 'master' into careminster
2012-01-26 09:10:46 +00:00
a6abecf5fa
Change references from sop to sog and add protection from null ref
...
I had code made additions to the map module that was based on the earlier work that I did before Melanie made improvements. Updating the new code to incorporate the same changes.
2012-01-26 00:33:34 -05:00
093469c33c
Add basic TestAddScript() regression test
2012-01-26 01:16:03 +00:00
36e6edfc65
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2012-01-26 00:44:32 +00:00
13d9b64b1d
Re-enable error logging associated with assembly and script loading failure in ScriptInstance.
...
Swallowing exceptions just leads to more mysterious failures later on.
2012-01-26 00:28:51 +00:00
4ce42762ee
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-01-26 00:21:21 +00:00
55c6cbabfd
refactor: change RezScriptFromAgentInventory(), RezNewScript() and AddInventoryItem() to accept an agent id rather than a full IClientAPI.
...
This stops some code having to make spurious client == null checks and reduces regression test complexity.
2012-01-26 00:10:37 +00:00
8e5502fdc2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-25 23:24:44 +00:00
2de3a1b9da
refactor: decompose most of RezScript() into RezScriptFromAgentInventory(), RezNewScript() and rename one RezScript() to RezScriptFromPrim()
2012-01-25 23:22:07 +00:00
d053625663
Update save oar and save iar help responses to reflect new -h|--home
...
switches which replace -p|--profile ie: "save oar
--home=http://hg.osgrid.org:80 region.oar"
2012-01-25 15:59:07 -07:00
e9de7e7107
Update BulletSim.dll with some interface changes and tuning (see opensim-libs). Change BSScene to use new interface.
2012-01-25 14:40:38 -08:00
2e7c1bcfd9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-25 21:26:34 +00:00
8f53c768f5
llGetParcelMusicURL implementation http://wiki.secondlife.com/wiki/LlGetParcelMusicURL
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-01-25 15:48:38 -05:00
82c3d0cf89
minor: stop the WebStatsModule logging UPDATE or INSERT every time it updates bin/LocalUserStatistics.db
2012-01-25 20:36:51 +00:00
e20cf3789b
Serialize calls to ODE Collide() function across OdeScene instances to prevent ODE crashes on simulators running more than one region.
...
It turns out that calls to Collide() are not thread-safe even for objects in different ODE physics worlds due to ODE static caches.
For simulators running multiple regions, not serializing calls from different scene loops will sooner or later cause OpenSim to crash with a native stack trace referencing OBBCollider.
This affects the default OPCODE collider but not GIMPACT. However, GIMPACT fails for other reasons under some current simulator loads.
ODE provides a thread local storage option, but as of ODE r1755 (and r1840) DLLs compiled with this crash OpenSim immediately.
2012-01-25 19:31:50 +00:00
7444f3bfad
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
...
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2012-01-25 15:02:54 +00:00
f84b69cad1
Change the WorldMapModule to use SOG rather than SOP for the telehub ans
...
cover a potential nullref
2012-01-25 15:00:06 +00:00
b996517c94
Typo fix
2012-01-25 15:18:31 +01:00
24862eaf15
Spin off starting scripts in rezzed objects into a thread to avoid a recursion
...
into the script engine if the script was suspended inside an event.
2012-01-25 14:44:09 +01:00
2ca80add14
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2012-01-25 15:24:25 +00:00
959bcfa7f8
Merge branch 'master' of /home/opensim/src/opensim
2012-01-24 21:35:12 -05:00
7c514fe155
Telehub map items displayed
2012-01-24 21:33:11 -05:00
3d1f43046d
Removed unused delegates in SceneGraph: ObjectDuplicateDelegate, ObjectCreateDelegate, ObjectDeleteDelegate
2012-01-24 17:05:53 -08:00
427ab55058
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2012-01-25 00:45:57 +00:00
2d0412d366
Make errors reported by OpenSim when it halts because it can't find certain config sections or files a bit more user friendly.
2012-01-24 22:35:55 +00:00
8e0eaa980f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-24 22:16:45 +00:00
09baa3e679
Comment out asset statistics section from periodic stats as these have not been recorded for a very long time.
...
Some might make a comeback in the future but others are of dubious usefuless for health check purposes, or the complexity of collection outweighs their usefulness.
Some data is available via other means (e.g. "fcache status").
2012-01-24 22:14:21 +00:00
3ae6345f1b
Merge branch 'master' of /home/opensim/src/opensim
2012-01-24 17:14:08 -05:00
dc329202ef
Put Telehubs on the map
2012-01-24 17:11:35 -05:00
5e445aaf7b
Fix "Abnormal client thread terminations" stat in period CONNECTION STATISTICS to count the number of times clients are disconnected due to ack timeouts.
...
This has been broken for a long period and would only ever show 0.
2012-01-24 22:09:13 +00:00
ab8956d58f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-24 22:04:28 +00:00
e8f1e7e96e
Comment out inventory statistics section from periodic stats, since this only contained the now uncollected and irrelevant inventory cache number.
2012-01-24 22:03:30 +00:00
488fe0ae9c
Removed unused events in SceneGraph: OnObjectCreate, OnObjectRemove, OnObjectDuplicate
2012-01-24 13:41:26 -08:00
7e76397a26
minor: correct text and usage for "image queues show" reigon console command.
2012-01-24 20:54:35 +00:00
a704d444f2
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-24 20:36:16 +00:00
8b035dc3c7
Restrict accessible of ODECharacter Shell and Body. Add method doc and some error log lines.
2012-01-24 18:46:24 +00:00
855d3a3ba5
Teleport routing, part 1
2012-01-24 04:06:37 +00:00
a4977bbe19
Simplify and streamline telehub editing code. Verify rotations and fix
...
spwan point positioning on rotated telehubs.
2012-01-24 02:36:35 +00:00
f10288ceae
Add handling bans properly
2012-01-24 03:14:00 +01:00
0369d21917
Add teleport routing, first part
2012-01-24 03:13:44 +01:00
0d2e02efb1
Reverse the spawn point distance vector
2012-01-24 01:30:41 +00:00
c0e1784e86
Correct a coordinate to make the viewer like it
2012-01-24 01:18:13 +00:00
cc02f78d4e
Simplify and streamline telehub editing code. Verify rotations and fix
...
spwan point positioning on rotated telehubs.
2012-01-24 01:48:38 +01:00
696fbdfa24
Reverse the spawn point distance vector
2012-01-24 01:29:50 +00:00
090bf7acca
Correct a coordinate to make the viewer like it
2012-01-24 01:17:41 +00:00
8fcb9bf418
Correct some SQL syntax
2012-01-24 00:57:52 +00:00
7a87be5015
Fix merge artefacts and build break
2012-01-24 00:45:17 +00:00
7bb01a17ee
Add a forgotten parameter
2012-01-24 00:38:00 +00:00
07ad821157
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Framework/RegionSettings.cs
2012-01-24 00:36:42 +00:00
87799c1f3d
Change Telehubs to store only the data that is really needed and not
...
additional redundant information.
2012-01-24 00:32:10 +00:00
c36c916342
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-23 21:25:59 +00:00
48379e6442
IMPORTANT!!!!! Please READ. DO NOT Use this version or any before it since the
...
Telehub commits! They will eat your babies and corrupt your database while
they munch. DO NOT use anything from the first Telehub commit to this one.
FIRST GOOD COMMIT is the one FOLLOWING this one. You have been warned.
2012-01-23 21:23:55 +00:00
8db64dc77f
Merge branch 'master' of /home/opensim/var/repo/opensim into telehub
2012-01-23 14:54:43 -05:00
6a85abbd14
Add update to Telehub position and rotation before adding SpawnPoints
2012-01-23 14:53:25 -05:00
c1f6478a37
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-23 11:10:56 -05:00
9cfc43005d
Cleanup
2012-01-23 10:28:18 -05:00
39c9b656c8
Cleanup unused parts, add some error handling
2012-01-23 09:42:15 -05:00
22ae9331bb
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-01-23 13:51:20 +01:00
4e0bb49394
Fix llLookAt the right way
2012-01-23 13:48:16 +01:00
cd2bf64b87
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
2012-01-23 00:24:31 +00:00
7c404375c7
Fix up some parameter naming
2012-01-22 23:20:10 +00:00
74c1ed77a4
Finish connecting Telehub to database
2012-01-22 14:51:15 -05:00
1cd26ba85e
Hooking up new telehub data to the database
2012-01-22 11:46:16 -05:00
02572ab1d3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionSettings.cs
2012-01-22 16:35:14 +00:00
24b20f6e4b
Change the key name I missed in last commit
2012-01-22 15:35:14 +00:00
68365c20c0
Move Telehub tables and data from EstateSettings to RegionSettings.
...
This is damage control es EstateSettings is not the place this can be put.
EstateSettings is nt unique to a region and therefore would introduce
a hard limit of one telehub per estate, completely shutting off the
option of having SL style telehubs, e.g. one per region. Whole
estate teleport routing can still be implemented id desiresd, this
way all options are open while the other way most options get closed
off.
2012-01-22 11:36:04 +00:00
32d58d6e3e
Telehub Support:
...
Telehub settings now persist to the database and are saved across sim restarts. So-far this only works on MySQL. this is a work in progress, teleport routing is not yet implemented.
2012-01-21 23:26:27 -05:00
ba3b0c69f1
Merge branch 'master' into careminster
2012-01-21 19:52:33 +00:00
590f707c42
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-20 23:54:29 -05:00
b6f3de5028
Telehub Support:
...
Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
2012-01-20 23:50:37 -05:00
ea72428c9d
Allow a viewer UDP image request retry to trigger another asset fetch if an existing fetch hasn't responded before a timeout.
...
This is to stop a high priority image/texture request from blocking the entire download queue if its asset fetch got dropped for some reason.
2012-01-19 23:09:16 +00:00
d38e2c0c91
Add image not in database test for LLImageManager
2012-01-19 21:57:12 +00:00
503faaea62
refactor: separate out common parts of LLImageManagerTests
2012-01-19 21:23:40 +00:00
381f74276b
Add LLImageManager regression test for discard case
2012-01-19 21:14:09 +00:00
c92a9a6640
Add "image queues clear <first-name> <last-name>" console command
...
This allows a way to manually clear pending image queue requests for debug purposes
2012-01-19 19:49:06 +00:00
d75899f2d1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-19 19:47:18 +00:00
8f871cca10
Add osGetGridHomeURI function
...
Add osGetHomeURI function to the family of osGetGrid* functions. Returns the SRV_HomeURI setting from the [LoginService] configuration.
2012-01-19 14:21:12 -05:00
9356963bd3
Add basic request and send image regression tests for LLImageManager
2012-01-19 19:00:11 +00:00
edb2e4c5b3
Change URI to lowercase to match existing
2012-01-19 13:55:53 -05:00
bf9ce4709f
Add fetching of SRV_HomeURI to "/json_grid_info"
...
Make SRV_HomeURI available on the GridInfoService through the "/json_grid_info" URI. This i s mainly to service OSSL, but can be seen externally via the URI.
2012-01-19 13:48:31 -05:00
e41f23dead
Trigger event when prims are scheduled for an update. This gives modules early access to changed parameters.
2012-01-19 03:06:35 -08:00
5ced49aaa8
Cleaned up Color and Text parameters in SOP and made LocalFlags public for module access.
2012-01-19 03:03:22 -08:00
2c6272d11a
Add a version of GetGroupByPrim to Scene which accepts UUID instead of localID
2012-01-19 03:01:37 -08:00
f8079bcd72
Fixed bugs in earlier commit on custom user parameters in Regions.ini
2012-01-19 02:52:05 -08:00
eea726d74e
RegionReady:
...
Back out some of the oar monitoring for the time being. Need to find a better way to get feedback. Will re-visit this soon.
2012-01-18 20:30:57 -05:00
ba7d8cedec
Add function osGetGridCustom
...
Add function osGetGridCustom to take an argument for the GridInfo kpv to retrieve from the GridInfoService
2012-01-17 22:38:36 -05:00
9ed9720861
Update osGetGrid**** functions
...
The osGetGrid**** functions will now get the grid settings from the GridInfoService. Set the GridInfoURI in your ./bin/config-include/GridCommon.ini [GridInfo] section.
2012-01-17 22:07:40 -05:00
939d60da59
Merge branch 'master' of /home/opensim/lib/osgrid/opensim
2012-01-17 21:10:31 -05:00
ef5575be1b
Add json handler for GridInfo
2012-01-17 21:09:46 -05:00
08b6b3bb48
Add some logging
2012-01-17 17:36:26 +01:00
5afb70b9fe
Fix prim calculations so that > 32767 prims are supported
2012-01-17 15:30:52 +01:00
747c25e920
Spin off NPC deletion into a thread to avoid it being done on a script
...
microthread. A stab at fixing exceptions.
2012-01-17 11:18:56 +01:00
e13a17cc0c
Allow retrival of multiple user records in one operation, analog to presence
2012-01-16 23:09:24 +00:00
b14a6acd2f
Merge branch 'master' into careminster
2012-01-16 23:08:47 +00:00
59a0c50d48
Comment out noisy log lines I accidentally included in the nant build target adjustment commit.
...
Left in the method doc.
2012-01-16 23:04:08 +00:00
82ad9d4e04
Remove monocov and other obsolete nant build targets.
...
monocov was a code coverage attempt 3 years ago which no longer works.
other removed targets have been commented out or unused for a very long time
2012-01-16 22:58:58 +00:00
d6b9504c84
Add methods to allow the groups modules to query online status and last login
2012-01-16 02:19:19 +01:00
35911d2362
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-01-15 14:51:00 +01:00
9447b6d15f
Merge branch 'master' into careminster
2012-01-15 14:40:33 +00:00
068b8e1f9b
Disable using an agent ID to clone NPCs. The griefing potential is too great
2012-01-15 14:49:32 +01:00
2e4fbe6b17
protect the region ready alerts for loading oarfiles if no post URI is set
2012-01-14 23:43:21 -08:00
43173f1b0d
commented out redundant land owner checks for osTeleportAgent there is
...
no need for these checks just use Allow_osTeleportAgent = PARCEL_OWNER
also increased function to severe threat level to make it harder to
accidently enable it for everyone.
2012-01-14 18:36:46 -07:00
ec299bfa87
Allow SmtpClients and other SSL users to work with our cert handler installed
2012-01-14 06:03:27 +00:00
4cbf8d728e
Fix merge
2012-01-14 05:39:56 +01:00
43128c9016
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-01-14 06:09:19 +00:00
72247bdaef
Allow SmtpClients and other SSL users to work with our cert handler installed
2012-01-14 05:28:57 +01:00
82f0e19349
Extend scripts show command to accept a single item UUID parameter to display one script's status
...
Usage is now scripts show [<script-item-uuid>]
2012-01-14 00:44:19 +00:00
b5bb559cc0
Register the UrlModule for script engine events OnScriptRemoved and OnObjectRemoved just once in the UrlModule itself, rather than repeatedly for every script.
...
Doing this in every script is unnecessary since the event trigger is parameterized by the item id.
All that would happen is 2000 scripts would trigger 1999 unnecessary calls, and a large number of initialized scripts may eventually trigger a StackOverflowException.
Registration moved to UrlModule so that the handler is registered for all script engine implementations.
This required moving the OnScriptRemoved and OnObjectRemoved events (only used by UrlModule in core) from IScriptEngine to IScriptModule to avoid circular references.
2012-01-14 00:23:11 +00:00
a30a02e7ae
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-13 14:51:11 -08:00
e1a2c44ebe
Cleaned up the LookAt code in SOP and SOG. Added support for incrementally
...
rotating physical objects. This does not use physics. Currently the rate
of change is determined as 1 / (PI * Strength).
2012-01-13 14:48:56 -08:00
cde80125ad
Merge branch 'master' of /home/opensim/src/opensim
2012-01-13 17:16:20 -05:00
02d6b033d0
Fix improper code formatting introduced in 6214e6a217
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-01-13 17:10:48 -05:00
adea92f8b7
Fix llRotLookAt and llLookAt for non-physical objects. Per conversation
...
with Melanie and Nebadon, SL behavior seems to be that non physical
objects snap to the request rotation.
2012-01-13 11:37:17 -08:00
57ba9ef5ad
Update RegionReadyModule
...
Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars.
2012-01-13 11:35:44 -05:00
982f3d58a9
Merge branch 'master' into careminster
2012-01-13 04:04:39 +00:00
9dc7fef4f6
Merge branch 'master' into careminster
2012-01-13 02:27:20 +00:00
c5594e839e
Undo some prior work
...
Move some added fuctions out of core into the addon module to keep things clean
2012-01-12 21:19:31 -05:00
acbff305f5
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-01-12 21:06:27 -05:00
d40ec1c346
Move some interfaces to a more apropriate place
2012-01-12 20:49:50 -05:00
3b59af2225
Change the default osNpcCreate() to create an 'owned' npc rather than an 'unowned' one.
...
An owned NPC is one that only the original creator can manipulate and delete.
An unowned NPC is one that anybody with access to the osNpc* methods and knowledge of the avatar id can manipulate.
This is to correct an oversight I made in the original reimplementation where I mistakenly assumed that avatar IDs could be treated as private.
I am not anticipating that many people were deliberately making use of unowned npcs due to their insecure nature.
If you do need an unowned NPC please call the new overloaded osCreateNpc() function with the option OS_NPC_NOT_OWNED.
2012-01-13 00:03:39 +00:00
6e7154d55c
Removing osNpcCreateOwned(). Please use osNpcCreate(string user, string name, vector position, string notecard, int options) instead with option OS_NPC_CREATOR_OWNED
...
Please note that correct option name is OS_NPC_CREATOR_OWNED not OS_NPC_CREATE_OWNED as mistakenly put in a previous commit.
2012-01-13 00:00:18 +00:00
47377f17c6
Add missing assert to confirm owner delete succeeded to the end of TestOsNpcRemoveOwned()
2012-01-12 23:46:43 +00:00
beab155434
Add api level test for removing an owned npc
2012-01-12 22:35:11 +00:00
c7757d1038
Fix typo
2012-01-12 23:07:38 +01:00
aa2cde2493
Disable unowned NPCs
2012-01-12 23:04:38 +01:00
cf166d3f1e
Merge branch 'master' into careminster
2012-01-12 23:22:55 +00:00
caa207f59f
Add ossl level test for removing an unowned npc
2012-01-12 21:03:54 +00:00
1ac5aa6808
Add remove test for unowned avatars
2012-01-12 20:47:19 +00:00
c4972e7734
Add osNpcCreate(string firstname, string lastname, LSL_Vector position, string notecard, int options) variant.
...
This will be documented soon. Options can currently be
OS_NPC_CREATE_OWNED - creates a 'creator owned' avatar that will only respond to osNpc* functions made by scripts owned by the npc creator
OS_NPC_NOT_OWNED - creates an avatar which will respond to any osNpc* functions that a caller has permission to make (through the usual OSSL permission mechanisms).
options is being added to provide better scope for future extensibility without having to add more functions
The original non-options osNpcCreate() function will continue to exist.
2012-01-12 19:37:30 +00:00
d27dd3714f
Allow all NPCs to show up on sensors as all osNpc* script methods now check for ownership permission before executing.
...
As per #opensim-dev irc discussion.
2012-01-12 19:19:34 +00:00
ba3491c76e
Add permissions checks for owned avatars to all other osNpc* functions.
...
This is being done outside the npc module since the check is meaningless for region module callers, who can fake any id that they like.
2012-01-12 19:06:46 +00:00
0a1d61950b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-12 19:03:26 +00:00
cadd645076
Renamed one var and deleted commented code. No functional changes.
2012-01-12 10:22:52 -08:00
b47c0d7e51
refactor: Move existing npc owner checks to NPCModule.CheckPermissions() methods and expose on interface for external calls.
2012-01-12 18:14:19 +00:00
8bdd80abfa
HG: normalize all externalized user ULRs to be the Home URL, i.e. the location of the user's UAS. This corrects an earlier design which had some cases pointing to the profile server. WARNING: CONFIGURATION CHANGES in both the sims (*Common.ini) and the Robust configs (Robust.HG.ini). Please check diff of the example files, but basically all vars that were pointing to profile should point to the UAS instead and should be called HomeURI.
2012-01-12 09:56:35 -08:00
4492bc1bcd
Merge branch 'master' into careminster
2012-01-12 17:52:29 +00:00
6214e6a217
Allow update of stored entries within User Management Module-this is needed for proper work of HG friends.
...
See http://opensimulator.org/mantis/view.php?id=5847
2012-01-12 17:51:13 +00:00
5d9e135b5c
Remove ViewObjectInventory method unsupported by core
2012-01-12 01:11:05 +01:00
1a3a1e6665
Adapt a cast to using the new TeleportFlags
2012-01-11 19:00:17 +01:00
38db874755
If deserializing a scene object fails during IAR load then ignore the object rather than halting the IAR load with an exception.
2012-01-11 14:33:26 +00:00
5f7e392c7c
Add a check to see if an asset exists before recreating it while
...
loading an archive. This does add an extra roundtrip to the asset
server if loading new assets but it protects against overwriting
(and potentially corrupting) existing assets.
2012-01-10 16:26:01 -08:00
53fb20880c
minor: Fix wrong column length in image queues report
2012-01-10 22:02:35 +00:00
5002f06d24
rename "show image queue" to "show image queues" in line with other udp info commands.
...
Eliminate redundant one line methods
2012-01-10 21:36:35 +00:00
ef074deb52
Add "show image queue <first-name> <last-name>" region console command
...
This is so that we can inspect the image download queue (texture download via udp) for debugging purposes.
2012-01-10 21:30:12 +00:00
8fa1108b72
Merge branch 'master' into careminster
2012-01-10 21:28:59 +00:00
a4c2e7f599
Merge branch 'master' into careminster
2012-01-10 20:34:43 +00:00
ce44f56af9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-10 11:11:08 -08:00
7b84942f86
HG landing points: this hopefully fixes some confusion that was making HG avies always land in 0,0
2012-01-10 11:10:47 -08:00
18497cef73
Add avatar names to appearance log messages
2012-01-10 18:54:20 +00:00
a3bb1a81de
correct very minor typo in "debug scene" help
2012-01-10 18:47:30 +00:00
66783398d0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-10 13:43:42 -05:00
d67e9916b8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-10 18:42:37 +00:00
3deb52d399
Teleport Debugging
...
Move setting from ini to existing facitilies - thanks justincc
toggle with console command: debug teleport
2012-01-10 13:41:35 -05:00
d67e8291c8
Add "app find <uuid-or-start-of-uuid>" command to find the appearance using a particular baked texture, if any.
...
This is for debugging to relate texture console entries back to particular users on the simulator end.
2012-01-10 18:41:07 +00:00
1cc685e820
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-01-10 18:33:32 +00:00
a22d0dcab9
HG Friends: fixed bug introduced by 571efeddb2 (r/17672)
2012-01-10 09:58:53 -08:00
707c8c6f2b
Add some run-time debugging support
...
Add configuration option - DEBUG to enable debugging methods. This is temporary for helping users testing teleport routing be able to report back the data with the test cases. We can remove when finished with this, or leave it if it proves to be useful.
Users: set DEBUG = true in OpenSim.ini to get more information from teleport routing. The default is false. It presently prints the TeleportFlags value.
2012-01-09 18:19:55 -05:00
b3a12167d6
Use our TeleportFlags
...
Switch to our TeleportFlags enum instead of LibOMV because we need to define a type for HG Logins. Also moved some debugging in ScenePresence into a function to make it simpler to enable/disable.
2012-01-09 17:54:35 -05:00
95345521f0
TP Routing debug
...
Fix test to checking against bitfield instead of int
2012-01-09 17:04:34 -05:00
3640afdd95
Fix teleport routing for incoming HG+Owner
...
Incoming HG owner/estate manager, etc. is routed according to the rules defined for teleports within the local grid. Left some commented debugging code inside so we can test other cases. Will remove when tings are settled in.
2012-01-09 14:31:22 -05:00
bc08cc201b
Merge branch 'master' into careminster
2012-01-09 19:22:06 +00:00
43145c7f67
Debugging HG teleport routing
...
Add some temporary debugging to the teleport routing to get a better view of what happens when HG jumps are made.
2012-01-09 13:07:02 -05:00
520b8b342e
Merge branch 'master' into careminster
2012-01-09 06:52:46 +00:00
34c42cdab0
Fix HG teleport routing
...
Needed to breakout the ViaHGLogin check to it's own section. For some reason it would not factor in when combined with the other teleport flag types.
2012-01-09 01:37:28 -05:00
0e855fea7c
Fix a build break
2012-01-09 01:05:19 +00:00
1ebd79e413
Add the HG case to landing point checks
2012-01-09 00:54:59 +00:00
d5c5bbe0a1
Update teleport routing to match Avination
2012-01-08 23:38:43 +00:00
44cde8d5c6
Update teleport routing to match Avination
2012-01-08 23:36:49 +00:00
fb16d49511
Merge branch 'master' of /home/opensim/src/opensim
2012-01-08 17:56:03 -05:00
266167f5a3
Fix teleport routing
...
Route non-owner avatars according to land settings
2012-01-08 17:41:47 -05:00
4bf2e19898
Merge branch 'master' into careminster
2012-01-07 18:11:21 +00:00
32eb7ddc37
Fix threat level setting on osNpcPlayAnimation
2012-01-07 18:09:53 +00:00
6f19e231b6
Don't try to save a NPCs attachment states on NPC delete
2012-01-07 18:09:45 +00:00
94fa6cb071
Fix threat level setting on osNpcPlayAnimation
2012-01-07 12:29:59 +01:00
efe51fd5cb
Don't try to save a NPCs attachment states on NPC delete
2012-01-07 12:06:21 +01:00
69c0f252a4
Force the group tag of NPCs to "- NPC -" unless the name is completely blank.
2012-01-07 12:05:42 +01:00
58cb7cd084
fix a typo "osNpcCreated" to "osNpcCreate" in OSSL threat level check
2012-01-06 23:07:48 -07:00
38ae479249
Make sure to prefix NPC names with "NPC:" so they can't be mistaken for users
2012-01-07 02:49:52 +01:00
f4231f0628
minor: remove mono compiler warning
2012-01-07 00:32:32 +00:00
ba163ab05b
Add method doc to SPA.Falling and use automatic private get property
2012-01-07 00:29:55 +00:00
c5c079f6aa
Fix bug where tapping home to stop falling would stop any avatar movement other than falling again.
...
Addresses http://opensimulator.org/mantis/view.php?id=5839
2012-01-07 00:17:40 +00:00
679d155a39
Fix some syntax issues
2012-01-06 23:08:18 +00:00
9668992493
Add osNpcPlayAnimation and osNpcStopAnimation which respect ownership as well
2012-01-06 22:59:50 +00:00
1cffd8fa03
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-06 22:36:35 +00:00
7518b075b7
Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results.
2012-01-06 22:35:06 +00:00
3073370d0e
Allow RemoteAdmin to deal with all the different kinds of region id parameter that have been used in different methods.
...
See http://opensimulator.org/mantis/view.php?id=5814
Thanks Michelle Argus!
2012-01-06 22:29:27 +00:00
70157a4ec5
Fix some syntax issues
2012-01-06 22:33:51 +01:00
a47aa46962
Add osNpcPlayAnimation and osNpcStopAnimation which respect ownership as well
2012-01-06 22:59:08 +00:00
a34278cfc3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
2012-01-06 22:41:26 +00:00
ff5a83d192
Fixed llAngleBetween() to allow denormal rotations
2012-01-06 21:14:42 +00:00
8c445dac67
Add script instruction count back to llRot2Euler. Other minor formatting/doc changes.
2012-01-06 21:12:22 +00:00
eb9bf71726
Replaced llRot2Euler function.
...
The original function suffered from unexpected results due to rounding
errors. An error of only 1 or 2 ulps would cause the code to not detect
a singularity at Y rotation +/- PI/2 and take the non-singularity code
path. The replacement code does not suffer from wildly inaccurate
results at the +/- PI/2 singularity. The check in the code for the
singularity isn't strictly needed, but gives more consistent results
At the singularity, the X and Z rotations add. The if check simply
forces the X rotation to be zero so the entirety of the X+Z rotation is
carried by Z.
Additionally, the test code has been updated to include test cases that
caused the old code to fail. The test algorithm is also updated to
perform a more meaningful test. The original code checked if the values
against expected values. This could fail at +/- PI rotations since a
rotation around an axis by PI causes the identical effect as a rotation
by -PI. The new test code checks that the returned angles can be used
to recreate a quaternion that causes the same rotation.
2012-01-06 21:08:54 +00:00
7661a0b2a9
Implement the FetchInventory2 capability. This accompanies the existing FetchInventoryDescendents2 capability.
...
Not yet enabled by default. You can enable this by setting Cap_FetchInventory2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini
Enabling both FetchInventory2 and FetchInventoryDescendents2 improves the situation with properly fetching attachments and hud objects
Probably because viewers are never expecting the odd situation where FetchInventoryDescendents2 is present but not FetchInventory2
However, for some reason attachments and hud objects occasionally fail to appear, though their status is correct in inventory
For attachments, focussing on the avatar makes them appear. Hud objects have to be reattached.
2012-01-06 21:07:34 +00:00
de9d6096a5
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-01-06 21:37:01 +01:00
11c48ac807
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Tests/LSL_ApiTest.cs
2012-01-06 21:41:36 +00:00
e9b9eb6a4c
Replaced llRot2Euler function.
...
The original function suffered from unexpected results due to rounding
errors. An error of only 1 or 2 ulps would cause the code to not detect
a singularity at Y rotation +/- PI/2 and take the non-singularity code
path. The replacement code does not suffer from wildly inaccurate
results at the +/- PI/2 singularity. The check in the code for the
singularity isn't strictly needed, but gives more consistent results
At the singularity, the X and Z rotations add. The if check simply
forces the X rotation to be zero so the entirety of the X+Z rotation is
carried by Z.
Additionally, the test code has been updated to include test cases that
caused the old code to fail. The test algorithm is also updated to
perform a more meaningful test. The original code checked if the values
against expected values. This could fail at +/- PI rotations since a
rotation around an axis by PI causes the identical effect as a rotation
by -PI. The new test code checks that the returned angles can be used
to recreate a quaternion that causes the same rotation.
2012-01-06 21:30:51 +00:00
f1846045a6
Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results.
2012-01-06 21:34:43 +01:00
f8c15d38a6
If dragging a script that is no copy from prim inventory into agent
...
inventory, stop it first in scene. If deleting from prims, move to trash
rather then making it poof.
2012-01-06 17:43:35 +00:00
3003133a66
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-01-06 17:39:39 +00:00
81cf774fe8
Merge branch 'master' into careminster
2012-01-06 17:38:53 +00:00
fbb2a7e90d
Add ThreatLevel.NoAccess to OSSL. This allows to enable OSSL without enabling
...
any methods, even those without threat, automatically. It is for use with
setups wanting to allow only specific methods to specific users.
2012-01-06 17:37:22 +00:00
31dc5aa728
If dragging a script that is no copy from prim inventory into agent
...
inventory, stop it first in scene. If deleting from prims, move to trash
rather then making it poof.
2012-01-06 13:15:04 +01:00
db482cb7dd
Fix up asset stuff
2012-01-06 00:04:32 +01:00
b06d878790
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-05 17:55:24 -05:00
23ce1dfc27
Remove a dangling command registration
2012-01-05 23:54:51 +01:00
fdfc4ab2a8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
2012-01-06 00:08:18 +00:00
f252161941
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-05 17:54:51 -05:00
Melanie