ba80f137b5
Prevent race conditions between two threads that call LLClientView.Close() simultaneously (e.g. ack timeout and an attempt to reconnect)
2012-07-19 22:32:27 +01:00
e9a121e1b2
Add TestCreateDuplicateRootScenePresence() regression test.
2012-07-19 21:54:50 +01:00
c0ab406e2e
Add basic TestCreateRootScenePresence() regression test
2012-07-19 21:41:13 +01:00
0d595ab19e
Merge branch 'ubitwork' into avination
2012-07-19 12:28:50 +02:00
ce8b9e6c57
Fix slow loading of task inventory
2012-07-19 12:27:36 +02:00
1c6e7de2dc
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-19 12:15:07 +02:00
0facebec40
Update ubitMesh primMesher with new Dahlia version on core ( reckick git
...
back)
2012-07-19 11:12:53 +01:00
5b68bff73b
kick git
2012-07-19 11:10:23 +01:00
36d744e2a5
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-07-19 09:47:51 +01:00
6dda7c65ae
Add EventManager.OnRegionLoginsStatusChange fired whenever logins are enabled or disabled at any point, not just during initial startup.
...
This replaces EventManager.OnLoginsEnabled which only fired when logins were first enabled
and was affected by a bug where it would never fire if the region started with logins disabled.
2012-07-19 00:09:22 +01:00
64db0bcbd2
Add back notification to neighbouring regions when RegionReadyModule is not active accidentally just removed in 528004d
2012-07-18 23:40:00 +01:00
528004d349
Perform other region ready actions even if simulator is configured to leave logins disabled on startup.
2012-07-18 23:35:05 +01:00
1971b6bb4f
Stop the 15 second initial script compile wait if a script is being rezzed on a previously empty region.
2012-07-18 22:24:52 +01:00
d97e27434c
Fix bug where region ready would be triggered a second time if a script was rezzed on a previously script-free region.
...
There is no need to listen for OnRezScript in RegionReadyModule since OnEmptyScriptCompileQueue will only fire if scripts were compiled.
2012-07-18 22:17:39 +01:00
58b72933c8
Fix bug where region ready was being triggered twice in quick succession if a region contained no scripts.
2012-07-18 22:09:20 +01:00
4973fddc51
Establish EventManager.OnRegionReady event. This will only be triggerred once when the region is ready.
...
Switch MapImageServiceModule to use this.
2012-07-18 21:52:07 +01:00
6460e587c4
Pass entire scene object in OnLoginsEnabled event rather than just the region name.
...
This saves listeners from having to re-retrieve the scene from their own lists, which won't work anyway if multiple regions with the same name have been allowed
2012-07-18 21:29:12 +01:00
742ad5eb93
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-07-18 21:26:28 +01:00
dd85d7d981
Merge branch 'master' of git://opensimulator.org/git/opensim
2012-07-18 13:07:07 -07:00
0dd14ca0a3
Missing parameter in log error message was throwing exception
2012-07-18 13:05:48 -07:00
cd6d7429f8
Only listen to LoginsEnabled event in RegionReadyModule if it has been asked to disable logins until all scripts have been compiled
2012-07-18 21:03:35 +01:00
4917637ce6
Fix llSameGroup to work according to specs
2012-07-18 14:30:40 +02:00
eb590becf0
Close() the ScenePresence after we've removed it from the scene graph, to cut down race conditions when another thread manages the grab the presence after some SP structures have been reset.
2012-07-18 00:14:02 +01:00
b9749d5aaf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-07-17 23:48:53 +01:00
48a5f10be1
Revert "Revert "refactor: make llGiveInventory() use existing GetInventoryItem() method rather than iterate through TaskInventory itself.""
...
This reverts commit 59a29f5f22
2012-07-17 23:48:09 +01:00
56870d9609
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-07-17 23:34:50 +01:00
ecb759c1e5
Fix regression where llGiveInventory() had stopped asking non-owner receivers to accept/decline.
...
This appears to be a regression from back in commit db91044http://opensimulator.org/mantis/view.php?id=6089
2012-07-17 23:31:38 +01:00
59a29f5f22
Revert "refactor: make llGiveInventory() use existing GetInventoryItem() method rather than iterate through TaskInventory itself."
...
This reverts commit 58b13d51a7
2012-07-17 22:56:21 +01:00
c489bc1cd2
Make the scrpt running flag work properly
2012-07-17 15:00:42 +02:00
5f57efd078
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-17 10:48:36 +02:00
5874dfd342
fix PollServiceRequestManager
2012-07-17 09:47:20 +01:00
0797736fba
Merge branch 'ubitwork' into avination
2012-07-17 10:25:13 +02:00
b35f97db46
Replace PollServiceRequestManager with older version, add extra logging to
...
event exceptions to see call path leading up to it.
2012-07-17 10:21:12 +02:00
d19555e7c5
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-17 06:46:51 +02:00
1ff498266c
minor changes, removed extra parts physics updates on linking nonroot
...
prims
2012-07-17 05:25:34 +01:00
f004db6572
fix our stats ( old schema )
2012-07-17 03:45:16 +01:00
666a935272
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-17 04:10:35 +02:00
cd0bf93e71
Merge branch 'avination' into ubitwork
2012-07-17 02:18:16 +01:00
1365fe07cd
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-17 02:41:58 +02:00
2b2dbec176
Merge branch 'avination' into ubitwork
2012-07-17 01:40:27 +01:00
e925b0654d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-17 02:07:21 +02:00
d5f4fb7b50
Merge branch 'avination' into ubitwork
2012-07-17 00:54:23 +01:00
130668057f
Fix merge artefacts
2012-07-17 01:42:42 +02:00
05cca8c694
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-17 01:33:31 +02:00
0d3661fb5f
UbitOde: remove useless water collider from active code.
2012-07-17 00:27:01 +01:00
356d597296
Restore update of inventory item on derez/logout. This is necessary to update the name if this has been changed whilst attached.
...
Note, this behaviour appears to be at variance with the ll grid as of Tues 17 July 2012, testing with viewer 3.2.1.
The item name in inventory does not change either at the point of detach or after a relog.
2012-07-17 00:17:51 +01:00
b0facd147a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-07-17 00:02:45 +01:00
b6476eaac3
Stop sending the viewer an inventory create message if a known attachment item is updated.
...
This doesn't seem to make any sense and probably stems from a period when this code was directly involved in attaching objects directly from the scene.
This message is already being sent by InventoryAccessModule code instead.
2012-07-17 00:00:26 +01:00
8204976fb4
Merge branch 'master' into careminster
2012-07-16 23:34:52 +01:00
2a85372169
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-07-16 23:33:33 +01:00
1c3b0da74a
Revert "Fix script "Running" behavior"
...
A better solution using the already present flags must be found.
This reverts commit 6d3ee8bb39
2012-07-16 23:31:55 +01:00
c1667d39a6
refactor: factor out common code in WebStatsModule.OnMakeRootAgent()
2012-07-16 23:15:02 +01:00
217f47b0d5
In WebStatsModule.OnMakeRootAgent(), get region ID directly from SP.Scene.RegionInfo.RegionID instead of manually looking it up from the stored scene list.
2012-07-16 23:09:48 +01:00
ed14dac0a3
Stop warning about no session from ViewerStats if user teleports to another region in the same simulator that was not next to the source region.
...
This was because teleporting to the new region invoked the new session setup code before the agent was removed from the old region, which then invoked the session teardown code.
Now, we only invoke the teardown code if the region ID occupied by the agent being removed is the same as the one registered for the current session.
2012-07-16 23:03:23 +01:00
40c6aef2e5
Merge branch 'avination' into ubitwork
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-16 22:30:54 +01:00
c256447f46
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-07-16 22:22:42 +01:00
9e99d2036c
Merge branch 'master' into careminster
2012-07-16 21:33:16 +01:00
ee7478fa16
sending more user-friendly messages to the script error window rather than the thrown exceptions.
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-07-16 21:32:38 +01:00
7b9c4d2826
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-16 21:32:10 +01:00
12049e1120
Allow setting linked avatar positions from within a prim not the one sat on
2012-07-16 11:03:12 +02:00
2eab788dcd
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-16 02:54:08 +02:00
cbaf59e086
** TEST ** put back corrected SetPrimParams for avatars, referenced to
...
sitpart and not m_host.
2012-07-16 01:47:50 +01:00
d3d877ceca
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-16 00:46:22 +02:00
3149eca68f
backkick git
2012-07-15 23:45:47 +01:00
5c145aa539
merge fix
2012-07-16 00:43:35 +02:00
8568771015
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-07-16 00:38:05 +02:00
cdd03acffa
just a kick git
2012-07-15 23:37:31 +01:00
911ca5b806
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-07-16 00:34:51 +02:00
15a1ad393c
Merge branch 'avination' into ubitwork
2012-07-15 23:33:06 +01:00
13e1635e4d
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-07-16 00:01:05 +02:00
0baa1b557a
Merge branch 'avination' into ubitwork
2012-07-15 23:00:28 +01:00
337b2e634a
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-07-15 23:56:00 +02:00
1b81a2bd49
to stash
2012-07-15 23:54:24 +02:00
2606484e45
Merge branch 'avination' into ubitwork
2012-07-15 22:53:05 +01:00
668723fab3
Remove instrumentation and fix the message delivery issue
2012-07-15 23:01:58 +02:00
59b6473472
Merge branch 'avination' into ubitwork
2012-07-15 21:32:10 +01:00
b130dcea21
Testing changes and instrumentation
2012-07-15 22:28:47 +02:00
5f991d92c7
Merge branch 'avination' into ubitwork
2012-07-15 21:20:26 +01:00
283df0610d
Save packets received while the client is added and replay them later.
2012-07-15 21:45:06 +02:00
8baf4dcc78
Reinstate older set rotation code for avatars since it works in all cases
2012-07-15 20:55:54 +02:00
a2d19b9703
Replace sit position and rotation code with older, working version
2012-07-15 20:48:47 +02:00
ec40c54509
Revert "Fix a sit rotation issue"
...
This reverts commit 47f7cc9457
2012-07-15 20:48:32 +02:00
47f7cc9457
Fix a sit rotation issue
2012-07-15 20:41:10 +02:00
8b4f7604e6
Revert "Experimentally handle UseCircuitCode synchrnonously"
...
This reverts commit e3fa73da96
2012-07-15 19:45:08 +02:00
1dc064981b
Merge branch 'avination' into ubitwork
2012-07-15 17:57:48 +01:00
e3fa73da96
Experimentally handle UseCircuitCode synchrnonously
2012-07-15 17:17:59 +02:00
35a5a064b0
Merge branch 'avination' into ubitwork
2012-07-15 15:40:23 +01:00
ad75a4b50b
Eliminate a spurious exception report when a https url is accessed with a wrong
...
CN
2012-07-15 12:28:58 +02:00
07b7301c22
Make https work in the poll service manager
2012-07-15 11:21:01 +02:00
6f7b5ef4cb
Fix a double parenthesis typo
2012-07-15 02:24:01 +02:00
62df82b74d
messing around... Let terrain and water have nullphysicsactors, let
...
nullphyscisactors have a type water, ground or unknown (default). having
this removed geom to name mapping no longer needed. Made some more methods
comum to prims and characters acessible via PhysActor allowing for a more
uniform access. ...
2012-07-15 00:50:00 +01:00
caef55a636
Set up https to work like http does in the poll handler
2012-07-15 01:05:04 +02:00
a492b6f693
remove forgotten line...
2012-07-14 20:13:40 +01:00
1dca94c72f
don't subscribe collision events for nonphysical parts only because of
...
collision sounds. Let them be passive
2012-07-14 20:10:38 +01:00
95f2d86549
Reinstate sleeping because less CPU is preferred over reporting accuracy.
...
Who needs accurate collisions when the sim lags and crashes?
2012-07-14 09:13:27 +02:00
5d3723a47f
update PrimMesher.cs to dll version r72 which fixes some path errors in sliced linear prims. Addresses Mantis #6085
2012-07-13 21:22:15 -07:00
84b7ae2573
acting on feedback from justincc
2012-07-14 01:45:34 +01:00
423101b425
acting on feedback from justincc
2012-07-14 01:45:34 +01:00
e3453dd9ca
added in some extra variables, it sometimes thinks it is on the same parcel :(
...
Signed-off-by: SignpostMarv <github@signpostmarv.name>
2012-07-14 01:45:34 +01:00
b6cd3b625e
adding workaround for silent failure if position is outside the bounds of a region, implementing parcel prim count check.
...
Signed-off-by: SignpostMarv <github@signpostmarv.name>
2012-07-14 01:45:34 +01:00
8d59385eea
Implementation of llSetRegionPos(). Does not implement failure on object entry/prim limit/access restrictions.
...
Signed-off-by: SignpostMarv <github@signpostmarv.name>
2012-07-14 01:45:34 +01:00
ec6a195e40
When generating a Warp3D texture, set the detailTexture[i] variable on resize from the JPEG2000 original rather than only saving it to disk.
...
This appears to be the cause of the warp 3d exception seen when starting a new region for the first time.
Subsequent starts were okay because resized saved bitmap was correctly retrieved from disk.
Should fix http://opensimulator.org/mantis/view.php?id=5204 and http://opensimulator.org/mantis/view.php?id=5272
2012-07-14 01:11:30 +01:00
72e2b94094
In collisions report linksets root parts to parts, and not all parts.
...
Temporary suspend collision checks on full stopped bodies, until a better
away is found wake them, avoiding spurius collision end and start events.
Until a nice way is found to avoid them, this may cause some higher cpu load. plus some clean up
2012-07-13 23:57:45 +01:00
39262f6232
missed fix on vehicle reference frame
2012-07-13 20:25:47 +01:00
5cfea5934b
fix bad vehicle reference frame
2012-07-13 19:32:43 +01:00
64393a7ca8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-07-13 02:27:16 +01:00
2954ceccae
Remove a callstack print out I accidentally left in 2 commits ago in 9ccb578
2012-07-13 01:08:49 +01:00
884d603cac
Rather than instantiating a UTF8 encoding everywhere when we want to supress the BOM, use a single Util.UTF8NoBomEncoding.
...
This class is thread-safe (as evidenced by the provision of the system-wide Encoding.UTF8 which does not suppress BOM on output).
2012-07-13 01:03:28 +01:00
9ccb578721
Don't cache regions data on the other unused LocalGridServiceConnector that the module code still sets up even if we're using one directly instantiated from the RemoteGridServiceConnector.
...
Also improves log messages to indicate which regions are sending/receiving various neighbour protocol messages.
2012-07-13 00:44:00 +01:00
d6f54b25cd
Stop redundantly passing in the endpoint to the LLClientView constructor.
...
This can always be retrieved via the LLUDPClient and is so done in various places already.
2012-07-12 23:48:42 +01:00
dda999a22c
Remove IClientIPEndpoint client interface for now.
...
This may well come back in the future when this subinterface is actually used but it currently isn't and I feel the name was poor.
Everything uses IClientAPI.RemoveEndPoint which also returned the full endpoint rather than just the ip address.
2012-07-12 23:43:02 +01:00
3b3d9967b1
Remove IClientAPI.GetClientEP() in favour of existing identical IClientAPI.RemoteEndpoint.
2012-07-12 23:29:57 +01:00
75ab9b4b88
Change very recent AllowedViewerList and BannedViewerList config setting names in OpenSim.ini.example to AllowedClients and BannedClients to match long-existing settings in [LoginService]
...
Also changes separator from comma to bar to match existing [LoginService] config features.
Divergence of config names for identical facilities in different places makes for an unnecessarily confusing user experience.
2012-07-12 23:18:30 +01:00
15283d35f1
Extend "show circuits" to show circuit code, ip and viewer name.
...
Also change to use standard table formatting
"show circuits" and "show connections" console commands are very similar but access different data structures.
2012-07-12 23:09:36 +01:00
4e97237460
Revert " lltargetomega efective spinrate now multiplied by gain ( need check )"
...
Undo figuring gain into spinrate in llTargetOmega. In SL, gain has null
effect on nonphysical spinning objects.
This reverts commit df55de5b3d
2012-07-13 00:01:01 +02:00
6a0de355e0
Add active status to "show connections"
2012-07-12 22:37:48 +01:00
65a25ee510
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-07-12 22:35:38 +01:00
ca412032e8
Put output for "show connections" command into standard table format.
...
Also moves into own method.
2012-07-12 21:36:33 +01:00
4c2523b1c2
Use faster any contact point collision detection for Volumedetect, plus
...
some clean up
2012-07-12 20:05:00 +01:00
d632fd7124
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2012-07-12 08:55:16 +01:00
743437262e
Many explanitory comments added to the link and delink code in
...
SOG and SOP. Should have no functionality changes.
2012-07-11 16:12:38 -07:00
906ac4adc4
Revert "Add instrumentation to log finalizer being called. Suppressed for backup"
...
This reverts commit ea91a36483
2012-07-12 01:01:43 +02:00
bae35ad97e
Revert "Place instrumentation in the proper place. This needs reverting, too!"
...
This reverts commit d9b0b03aa3
2012-07-12 01:01:29 +02:00
c66367e619
Add "gc collect" console command for debugging memleaks
2012-07-12 00:16:19 +02:00
d9b0b03aa3
Place instrumentation in the proper place. This needs reverting, too!
2012-07-11 23:54:45 +02:00
916e3bf886
Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies.
...
The encodings are thread-safe and already used in such a manner in other places.
This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM.
2012-07-11 22:54:22 +01:00
ea91a36483
Add instrumentation to log finalizer being called. Suppressed for backup
...
interim copies to avoid spammage. Not for release to the grid, must be
reverted first!
2012-07-11 23:33:13 +02:00
59cd0a2419
Change order of operations on backup to ensure keyframe motions are backed
...
up properly
2012-07-11 23:32:12 +02:00
33cff9b9d7
Allow XEngine StartDelay to be configured in the [XEngine] config section.
...
This is only currently meant for use by regression tests that don't have any issues if XEngine is started up quickly, since no other operations will be occuring simultaneously.
Therefore, this is not yet documented externally.
2012-07-11 21:55:18 +01:00
0e611c47d3
Remove WorldComm module from the regression TestCompileAndStartScript() since the infrastructure no longer fails if this module isn't present, at least on the tested codepaths
2012-07-11 21:46:46 +01:00
fc24563206
Add regression TestDetachScriptedAttachmentToInventory()
...
This currently only does a relatively crude check for a ScriptState node in the serialized xml
2012-07-11 21:43:35 +01:00
065046845d
be paranoic (?)
2012-07-11 21:10:46 +01:00
236b5a0298
Replace a Multicast Delegate by a simple list of delegates in access Get
...
Can't seen more than one evocation on the multicast on this case, even expanding its evocation list (as it should be used in case one fails). With the list i
do see what we want.
2012-07-11 20:54:55 +01:00
14d05dc2a9
Add regression TestRezScriptedAttachmentsFromInventory() though this currently only checks for the presence of script items, not for started scripts
2012-07-11 19:54:40 +01:00
89c9528e38
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
2012-07-11 14:27:33 +01:00
6252114ea0
remove expensive and leaked ( in Xengine at least) SayShout timer and
...
replace it by a simpler function that should do the same (?) (don't like
much those 10 + 1 bursts)
2012-07-11 09:03:18 +01:00
84ab4c4462
ubitODE leaks
2012-07-11 08:13:57 +01:00
bb78b327c0
stop keeping references to objects on released items
2012-07-11 06:43:03 +01:00
0bc8238a6c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Watchdog.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-07-11 03:56:50 +01:00
ac3a2296fa
Make sure handles stay intact when removing from the MinHeap
2012-07-11 04:01:20 +02:00
7836933133
Melanie fix: detach SOGs from backup on linking
2012-07-11 03:58:58 +01:00
7676ae6f74
clear released minheap items so they don't keep holding references to
...
objects.
2012-07-11 03:56:39 +01:00
337ea019bd
If a part has a sit target and an avatar is already sitting, allow another avatar to sit in the position given if no sit target was set.
...
Previous behave was that the second avatar could not sit.
This matches behaviour observed on the LL grid.
2012-07-10 23:55:22 +01:00
cdea572d2e
refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() and SOP.RemoveSittingAvatar()
2012-07-10 23:50:04 +01:00
11e0ad6dc8
Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability"
...
This reverts commit c8f0d476d2
2012-07-10 23:39:05 +01:00
c8f0d476d2
refactor: Add SOP.IsSitTargetOccupied to improve readability
2012-07-10 23:34:40 +01:00
69a6f6e3cd
refactor: use sit orientation argument passed in to SP.SendSitResponse() rather than creating a new copy
...
There are no issues with side-effects since this is a struct.
2012-07-10 23:26:40 +01:00
e8347b7095
Move common code to detect whether a part has a valid sit target into a SOP property rather than being repeated in SP.
...
This also makes the detection in SP.FindNextAvailableSitTarget() and SendSitResponse() identical.
Previously they varied slightly (SendSitResponse didn't check for an older type of invalid quaternion) but the practical effect is most probably zero.
2012-07-10 23:21:39 +01:00
506437b684
Remove log line accidentally left in SP.SendSitResponse()
2012-07-10 23:06:34 +01:00
9f01c3d408
Disable logging in regression test in OSSL_ApiAttachmentTests
2012-07-10 23:04:44 +01:00
58869e5aa0
Fix recent SOP.GetSittingAvatars() to return null if there are no sitting avatars rather than throwing an exception.
...
Extends sitting avatar regression tests to test new sitters information
2012-07-10 23:03:52 +01:00
f3134b5cf6
When an attachment is detached to inv or derezzed, stop the scripts, update the known item with script state still in the script engine and then remove the scripts.
...
This is to fix a regression starting from 5301648
2012-07-10 22:41:11 +01:00
eb5ec4a786
If a script is being stopped manually, then give the scriptpool thread 1 second to finish normally before forcibly aborting.
...
This is to avoid the worst of the problems in mono 2.6, 2.10 where an aborted thread does not always release all its locks.
This very short grace period is identical to the existing behaviour when a script is removed from the scene.
2012-07-10 21:42:51 +01:00
b5b763f7e1
add some more memory information to StatsCollector
2012-07-10 19:13:24 +01:00
6b8b7007c4
console region restart: Let Xengine not cry all over the place with
...
errors also. May not be that good, but is not in use in AVN (i hope). Still safer to do a full shutdown and refire the region from a OS tool like a script, monit, etc etc
2012-07-10 18:23:38 +01:00
4a91c65dbc
Merge branch 'avination' into ubitwork
2012-07-10 17:40:55 +01:00
df55de5b3d
lltargetomega efective spinrate now multiplied by gain ( need check )
2012-07-10 05:51:41 +01:00
acec9da95c
let SOP AngularVelocity set physics actor angular velocity if it's
...
physical root prim and not a vehicle. With this llSetAngularVelocity
should work and also llTargetOmega will do the same in this case.
but for now this llTargetOmega is being a normal physical rotation with
damping, and stops with selection. Thats not like SL apparently
2012-07-10 05:37:41 +01:00
652ac5f66b
more work on llSetAngularVelocity()
2012-07-10 05:28:47 +01:00
ca41ec9eb4
let rotationVelocity or AngularVelocity be setted on prims. Limited to
...
12rad/s
2012-07-10 05:11:06 +01:00
c8af20f966
This script allows an object to be attached directly from prim inventory to another avatar in the scene.
...
Very useful in serious game/environment scenarios where its only allowed for trusted creators.
Threat level Severe
2012-07-09 23:08:41 +01:00
d6f563794e
Don't allow a prim to be sat upon if its part of an attachment
2012-07-09 21:43:44 +01:00
2eaa6d5ace
Do not allow a script to attach a prim if its being sat upon.
...
This prevents a stack overflow where a get position on the avatar will refer to the attachment which will in turn refer back to the avatar.
This required recording of all sitting avatars on a prim which is done separately from recording the sit target avatar.
Recording HashSet is null if there are no sitting avatars in order to save memory.
2012-07-09 21:24:32 +01:00
3a1d46ad44
retry fixing ode getconfiguration()
2012-07-09 17:21:54 +01:00
a709768085
fix ode getconfiguration
2012-07-09 17:01:52 +01:00
0ac161c9a8
log ODE lib configuration
2012-07-09 16:51:56 +01:00
fb8e8dcbce
fix ODE dispose plus minor clean. On regions restart ode.dispose seems
...
to be called with scene still calling simulation, that should be changed,
for now added a check for a valid world in ode simulation
2012-07-09 13:25:17 +01:00
1077d7b6f5
Reinstate parallel fetching of residents and remove a left over return from debugging
2012-07-08 21:53:23 +02:00
1e4c656497
Revamp map block sending to eliminate overload of the grid server connection
...
and the sim's http client
2012-07-08 10:44:53 +02:00
73c5a6e666
Instead of sending 20 records in 2 packets, send just one as we intended in the first place.
2012-07-08 07:42:40 +02:00
d3b778ebbe
Address map lag issue seen with non-avination viewers
2012-07-08 06:06:33 +02:00
470019b52a
Change semantics of FromXML on vehicle data to make the serializer a bit cleaner
2012-07-07 19:59:55 +02:00
afa02aa104
fix vehicle to XML string
2012-07-07 07:41:11 +01:00
d0f7fb1d35
Merge branch 'avination' into ubitwork
2012-07-07 03:49:31 +01:00
d50b852d53
ODE turn off material dependent friction while vehicle linear motor is Effective. Increase a bit world damping of velocities
2012-07-07 03:16:41 +01:00
3024bdd097
Fix storing vehicle data
2012-07-07 02:29:21 +02:00
6535f23e4b
Add saving vehicle physics data to the database
2012-07-07 02:05:01 +02:00
112cddc9ca
minor: rearrange INITIALIZATION COMPLETE log message so that it's clear init is only complete for a particular region at a time
2012-07-07 00:53:17 +01:00
16d5b79d57
minor: remove some recent mono compiler warnings
2012-07-07 00:36:01 +01:00
1201307c73
Remove duplicate Warp3DImageModule entry in CoreModulePlugin.addin.xml
...
This was causing 2 copies of the module to be created for each scene.
Probably no bad consequences other than a small waste of memory (both for the module and for the warp3D renderer it loaded)
2012-07-07 00:26:25 +01:00
a85741ac37
minor: Make WORLD MAP category log lines consistent
2012-07-07 00:14:16 +01:00
3bd134474b
minor: Get RegionReady module to shout initialization complete status to draw the eye
2012-07-07 00:09:33 +01:00
b19ead5f9e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-07-07 00:05:16 +01:00
7ff4eec79c
Remove redundant SetScene() function in Scene.AddSceneObject()
...
This is always done later on in SceneGraph.AddSceneObject() if the call hasn't failed due to sanity checks.
There's no other purpose for this method to exist and it's dangerous/pointless to call in other conditions.
2012-07-07 00:02:45 +01:00
7aff238eee
Merge branch 'bulletsim2'
...
Cleanup preceeding major work. No major functional changes.
Collisions reported to simulator more efficiently.
BulletSim binaries updated using a more recent version of Bullet (v2.80-r2527).
2012-07-06 15:59:09 -07:00
f1f390cfdf
Remove now duplicate interregion object check that should have been removed a few commits ago in 43a2da9
2012-07-06 23:22:40 +01:00
74014a3854
minor: Remove some wrong comments in attachments regression tests
2012-07-06 23:13:00 +01:00
e4a6611865
Clean up collision reporting code so they are properly passed to
...
the simulator in batches.
More comments.
2012-07-06 15:09:19 -07:00
056c9a59b2
Add assert to attachment regression tests to check that number of objects in the scene graph
2012-07-06 23:07:50 +01:00
ae1f2114f5
Mantis 6077 trim NPC chat on channel zero.
...
This patch trims leading and trailing spaces from NPC chat and
suppresses the sending of empty chat strings on open chat channel 0.
2012-07-06 22:49:18 +01:00
1b1f841c6a
Mantis 6063 osNpcTouch.
...
Allow NPCS to touch obects.
2012-07-06 22:37:19 +01:00
43a2da9edb
Pull prim crossing/teleport checks up into Scene.IncomingCreateObject() from Scene.AddObject()
...
Only IncomingCreateObject() needs these checks. General object adding does not need to perform crossing perm checks
2012-07-06 22:33:16 +01:00
f6e5791ecd
refactor: extract method UpdateUserInventoryWithAttachment() from AttachObject() for better code comprehension
2012-07-06 22:07:19 +01:00
26d89777d8
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceEventArgs.cs
OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueGetModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-06 20:51:18 +01:00
ce7864632b
added llSetVelocity. will refuse to work on vehicles and on attachments ( this last may need fix) added also some code for llSetAngularVelocity but not working still
2012-07-06 17:13:11 +01:00
ba91d4ba93
Changed GetTexture error code RequestedRangeNotSatisfiable to NotFound, since viewers don't seem to handle that and keep retrying
2012-07-06 01:06:48 +01:00
843112340e
Log MONO_THREADS_PER_CPU value on simulator startup, or "unset" if it is not set
2012-07-06 00:37:45 +01:00
b8c2efa49c
Convert the slow request queue into a regular queue and add some cleanup
...
and locking.
2012-07-06 00:23:05 +02:00
7e73f609e5
Log warning if time between invocations of the watchdog thread is twice the timer setting.
...
This is to help detect situations where thread timeout warnings are being generated because of general machine issues rather than deadlock, network or other problems.
2012-07-05 23:15:59 +01:00
bf292ce26f
Fix the boo-boo
2012-07-05 23:24:15 +02:00
5776351f6a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-05 22:17:39 +01:00
4854d77904
Add an EventType enum and Type field to the poll service event args. This allows
...
the manager to tell what type of event it is. All events except for lsl http in
go to the "slow queue" which is run once per second as before.
2012-07-05 23:09:20 +02:00
db9616f7ba
minor: add client name to various login service log messages to disambiguate messages from concurrent logins. Also adds destination resolution debug log message showing region endpoint.
...
Adding endpoint to the log helps to find issues where the region external host information has been wrongly configured
2012-07-05 21:30:20 +01:00
8674604ff5
regrade osFormatString, osMatchString and osReplaceString to VeryLow.
...
I can't see that these present any real hazard to sim functioning.
2012-07-05 21:10:59 +01:00
510e809aba
porting console commands from raw2sculpt 3.2
2012-07-05 00:16:31 +01:00
951b45b80f
Add OSSL function osForceAttachToAvatarFromInventory()
...
This works like osForceAttachToAvatar() but allows an object to be directly specified from the script object's inventory rather than forcing it to be rezzed in the scene first.
Still only attaches objects to the owner of the script.
This allows one to bypass the complicated co-ordination of first rezzing objects in the scene before attaching them.
Threat level high.
2012-07-05 00:05:06 +01:00
7b327848d0
Use GetInventoryItem() in llRezAtRoot rather than iterating through a cloned dictionary
2012-07-04 22:21:47 +01:00
2f998fce1f
refactor: In llGetNotecardLine() use existing GetInventoryItem() rather than inspecting a clone of the TaskInventory dictionary that was not cloned thread-safe
2012-07-04 22:00:39 +01:00
1816ecb747
refactor: In llGetNumberOfNotecardLines() use existing GetInventoryItem() rather than inspecting a clone of the TaskInventory dictionary that was not cloned thread-safe
2012-07-04 21:57:57 +01:00
eacba4fc0b
refactor: use existing GetInventoryItem() in GetScriptByName(), itself renamed from ScriptByName()
2012-07-04 21:54:30 +01:00
9fac7fd932
refactor: In llGetInventoryType() use existing GetInventoryItem()
2012-07-04 21:50:52 +01:00
f2b0377c28
refactor: In llGetInventoryCreator() use existing GetInventoryItem()
2012-07-04 21:49:21 +01:00
d933bdbd59
refactor: In llGetInventoryPermMask() use existing GetInventoryItem()
2012-07-04 21:47:20 +01:00
f9fa34408d
refactor: in llGetInventoryPermMask use existing GetInventoryItem()
2012-07-04 21:42:04 +01:00
857494f6bd
refactor: In llRemoteLoadScriptPin() use existing GetInventoryItem()
2012-07-04 21:36:44 +01:00
dff7cae2ee
refactor: replace use of LSL_Api.GetTaskInventoryItem() with existing GetInventoryItem()
2012-07-04 21:33:35 +01:00
0e3fce9b5c
refactor: In llGetInventoryKey() use existing GetInventoryItem()
2012-07-04 21:25:58 +01:00
4b2b14dad1
In llMessageLinked() use GetInventoryItems() rather than cloning TaskInventory directory
...
GetInventoryItems() returns a new list and so is equivalent, and creates this list under lock whereas Clone() is not thread-safe
2012-07-04 21:22:43 +01:00
3769739ca7
In llRequestInventoryData() use GetInventoryItems() rather than cloning TaskInventory directory
...
GetInventoryItems() returns a new list and so is equivalent, and creates this list under lock whereas Clone() is not thread-safe
2012-07-04 21:19:16 +01:00
3717812ce0
refactor: In llCollisionSound() use existing GetInventoryItem() method rather than have it iterate through TaskInventory itself.
2012-07-04 21:15:00 +01:00
ae64d089c6
refactor: In llRemoveInventory() use existing GetInventoryItem() method rather than have it iterate through TaskInventory itself.
2012-07-04 21:05:51 +01:00
58b13d51a7
refactor: make llGiveInventory() use existing GetInventoryItem() method rather than iterate through TaskInventory itself.
2012-07-04 20:57:48 +01:00
bc5d554f54
use the pollEvent timeout paramenter on pooling
2012-07-04 17:58:32 +01:00
02cb0bf80a
added a timeout paramenter to PollServiceEventArgs, so each type can define it's timeout
2012-07-04 17:40:02 +01:00
e533eef962
*test2* http poll: increased again the pool rate do 10/s but increased timeout to 1s. So data there is less delay when there is new data, but enought waiting time for it to be avaiable
2012-07-04 15:07:10 +01:00
b2fa20001f
*test* slow http retries pool rate to original 1s
2012-07-04 06:14:47 +01:00
5691a8b860
refactor: rename Watchdog.WATCHDOG_TIMEOUT_MS to DEFAULT_WATCHDOG_TIMEOUT_MS to reflect what it actually is
2012-07-04 00:15:03 +01:00
f7b4802577
Correct spelling mistake m_BanedViewers to m_BannedViewers
2012-07-03 23:26:02 +01:00
8183c2926d
minor: Add some method doc to HasGroupChanged and Schedule GroupForFull/PartUpdate() to indicate when region modules need to invoke them
2012-07-03 23:19:11 +01:00
3c9b9a848f
Fix issue in database tests where sogs being stored are not in a scene.
...
This puts an extra m_part.ParentGroup.Scene == null check at the top of SceneObjectPartInventory.QueryScriptStates()
2012-07-03 22:58:58 +01:00
3399596e0e
Adds a list of viewers that are allowed or banned from the region.
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-07-02 18:45:11 +01:00
13640a256a
Merge branch 'ubitwork' into avination
2012-07-02 02:09:15 +02:00
4f04ec5fc2
Implement the buggy version of llXorBase64Strings() for compatibility's sake
2012-07-02 02:04:56 +02:00
d32cf21576
Add preservation of running state of scripts when drag-copying.
2012-07-01 18:30:59 +01:00
7eb95c9ed9
Bring casing of llSHA1String in line with SL
2012-07-01 18:05:35 +02:00
e5eef139ed
Merge branch 'master' into careminster
2012-07-01 03:04:23 +01:00
d3f1fc79e5
*TO CHECK/REVIEW/REVERT/TEST whatever* pollService new requests get enqueued to unified requests queue directly. Retries get into that every 100ms. 3 working threads as before plus another that only does retries timming.
2012-07-01 01:33:20 +01:00
96270b1b28
Merge branch 'avination' into ubitwork
2012-07-01 00:08:31 +01:00
ec7c7fe5f8
ubitode: create and use 4 off world collision spaces for offworld static prims
2012-06-30 08:49:07 +01:00
1926de5a05
Remove some mono compiler warnings
2012-06-30 01:25:39 +01:00
a4551b027b
Removing unused handling of incoming create object by userID and itemID only.
...
It appears this was never actually used since attachments were rezzed in other code.
This was never available on remote simulator comms, only local.
2012-06-30 01:14:49 +01:00
56c776066c
Remove code listed for removal in 0.7.3 that handled script restart for incoming attachments from pre-fatpack regions (versions of OpenSimulator more than a year old)
2012-06-30 01:06:37 +01:00
6137f37028
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-06-29 22:24:53 +01:00
05cf51cbbd
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/PollServiceWorkerThread.cs
2012-06-29 22:11:49 +01:00
e9e409a794
Remove spammy debug
2012-06-29 22:37:16 +02:00
38cdf77cef
in CreateAvatarUpdateBlock() change updateflags to 0. Original flags seem prim related only. This does fix the wrong viewer side move of a avatar in prim edition mode (anv mantis 854), with no apparent side effects .. may need more testing
2012-06-29 03:41:04 +01:00
2870659b5c
Merge branch 'ubitwork' into avination
2012-06-29 04:03:24 +02:00
7ab8bc0a60
don't recoil attachments doing llRezObject()
2012-06-29 01:17:53 +01:00
0229e90dcc
Move update of the final optional ODE total frame stat inside the OdeLock rather than outside to avoid a very occasional race condition with the stat collection thread
2012-06-29 01:02:35 +01:00
58b4417140
Merge branch 'avination' into ubitwork
2012-06-29 01:00:38 +01:00
e420f815dc
refactor: rename _collisionEventPrim to m_collisionEventActors and _collisionEventPrimChanges to m_collisionEventActorsChanges to reflect their actual contents.
...
These dictionaries handle all actor types, not just physical prims.
2012-06-29 00:54:40 +01:00
1a7be7b00e
Fix a regression where we stopped removing avatars from collision event reporting on logout, rather than stopping clearing their collision events.
...
This occurred in b18c8c8
2012-06-29 00:36:50 +01:00
0f6b7b6a41
If a link points to a non-existing item in FetchInventory caps, then don't try to add it to the return data rather than suffering an exception later on
2012-06-29 00:11:44 +01:00
f0f928dce1
Merge branch 'ubitwork' into avination
2012-06-29 01:04:48 +02:00
f202c36106
Add IScene.Name for code clarity to replace the RegionInfo.RegionName used in many, many log messages.
2012-06-29 00:03:22 +01:00
0d26e271c9
stop chat being sent to child avs again.
2012-06-29 01:02:22 +02:00
bfa6896678
Change AttachmentsModule.DetachSingleAttachmentToInv() to accept a SOG directly instead of an item ID to then shuffle through attachments, saving CPU busywork.
...
Almost all callers already had the sog to hand.
Still checking that it's really an attachment, but now by inspecting SOG.AttachedAvatar
2012-06-28 23:31:23 +01:00
571fd966cb
Rather than iterating through all SOGs in the scene looking for the one that matches out fromItemID on detach, go through the agent's attachment sog list instead.
2012-06-28 23:01:12 +01:00
f263d6a910
Remove code that tried to delete an attachment back to inventory if RezSingleAttachmentFromInventoryInternal() returned null.
...
null would only ever be returned if the item couldn't be located within inventory and this would happen immediately.
In this case, derezzing wouldn't work anyway since there is no item to derez.
2012-06-28 22:48:49 +01:00
a1a22a2f10
Revert "Mantis 5977 Corrections to llRegionSayTo"
...
This reverts commit 679da63da6
2012-06-28 22:02:20 +01:00
972b0b52f9
If rest of first line after colon is blank then still warn about running in XEngine if engine specified does not exist.
...
This is to take account of situations where the user was intending to specify a script engine using colon using its default language.
This probably generates few false positive as scripts are less likely to end a first line colon with a comment for other purposes.
2012-06-28 21:30:36 +01:00
498820a74f
Merge branch 'ubitwork' into avination
2012-06-28 22:06:02 +02:00
c87f0ac226
Fix llRegionSayTo the right way
2012-06-28 21:23:42 +02:00
8a03c153d5
Return NPC instead of AGENT in the detect parameters for touch, collision and
...
sensor.
2012-06-28 20:29:37 +02:00
29abb7d62a
reactivate physics raycasts on llCastRay() until it's clear what is its problem if any...
2012-06-28 12:20:55 +01:00
de10a16546
Merge branch 'avination' into ubitwork
2012-06-28 10:57:47 +01:00
41a1903c60
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
2012-06-28 03:21:08 +01:00
25baa2d894
Avoid reporting false positives when a colon is in a comment in the first line of a script where the user was not trying to select a different script engine.
...
This works by only posting the "Selected engine unavailable" message if we're falling back on XEngine and the language is one handled by XEngine.
In cases where the language is not handled or not allowed, the user will still be notified by the later compiler error.
This avoids the overwhelming majority of false positives where the first line contains a : for other reasons (e.g. source control systems, vim settings, etc.)
Ultimately, I think it would be better to detect script language/engine with a mechanism that didn't just rely on : detection (e.g like #! in unix scripts).
2012-06-28 01:01:18 +01:00
f9769a9fcb
minor: reuse colon index calculation in XEngine.OnRezScript. The index if a colon is found on the first line will always be the same as for the whole script.
2012-06-28 00:37:23 +01:00
bb48060b44
Fix issue in InventoryArchiveTestCase where it didn't call down to OpenSimTestCase.SetUp()
2012-06-27 00:50:36 +01:00
d043213317
refactor: Move ScenePresence <-> AgentData attachments copying code into AttachmentsModule.
2012-06-27 00:41:46 +01:00
5bec5bcf71
Automatically disable log4net before each regression test so that logging is confined to a single test if it's turned on.
...
This involves making test classes inherit from a common OpenSimTestCase.
This will be applied to more classes as required.
2012-06-27 00:01:51 +01:00
87ca820f9b
Replace "kill uuid" console command with the more consistent "delete object uuid", which was present in the last opensim release.
2012-06-26 23:28:48 +01:00
0b29877790
Fix output for help on some object region console commands
2012-06-26 23:15:15 +01:00
625041f1db
Comment out a spammy message that will spew 4 lines for each request to a
...
nonexistent URL for http-in
2012-06-27 00:10:51 +02:00
97437feb06
Show region positions in "show regions" robust console command
2012-06-26 23:05:10 +01:00
2524517986
minor: correct GridService "show regions" cibsike cinnabd usage statement
2012-06-26 22:54:41 +01:00
99954c1498
refactor: Remove unnecessary AttachmentModuleTests.m_userId in favour of local variables
2012-06-26 22:53:08 +01:00
2b82c421ad
refactor: Use local attachment module variables instead of global m_attMod.
...
This also avoids confusion between tests where one sets up m_attMod and another accidentally uses it after failing to set one up itself.
2012-06-26 22:31:25 +01:00
4329cc7b8a
refactor: make m_presence a local variable in all AttachmentsModuleTests since it doesn't need to be global and some tests set up more than one sp
2012-06-26 22:21:54 +01:00
32a4ce94f0
Add regression test to check that attachments in source region are deleting when an agent teleports to a neighbouring region
2012-06-26 22:16:44 +01:00
340005c5bf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-06-26 22:12:39 +01:00
4b6c3fd4bb
If crossing attachments into another region pre-fatpack, clone objects before changing properties to avoid hud display race condition with update threads.
...
This matches behaviour in fatpack crossing, where attachments are cloned before their properties are changed.
This only applies to crossings to simulators running code released before April 2011.
2012-06-26 21:06:47 +01:00
988112d446
Add stub for llCastRay
2012-06-26 15:15:25 -04:00
7cc5b3d7d3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-06-26 17:35:55 +01:00
9a8de52940
Add an event to the poll service manager thread to allow starting it
...
when needed rather than once per second. That is just too slow!
2012-06-26 10:49:37 +02:00
2548d15878
Disable physics raycast until it can be seen to. Fix distance calculation
...
for some results.
2012-06-26 10:48:52 +02:00
2ea8d820b0
Correct a wrong error constant
2012-06-26 10:48:27 +02:00
fcb34efa95
Prevent bad prim in the database from crashing the sim, list affected
...
ids and skip them.
2012-06-26 10:47:35 +02:00
1f22b29ca3
Add much easier ConsoleDisplayTable AddColumn() and AddRow() methods.
...
Use these for new "show regions" command rather than old cumbersome stuff.
2012-06-26 00:40:46 +01:00
5292b8b8be
Add "show regions" console command to ROBUST to show all regions currently registered.
...
Command is not added in standalone, which has its own version of "show regions" that can also show estate name
2012-06-26 00:34:37 +01:00
854f2a913c
Add "show region at" command to grid service to get the details of a region at a specific location. "show region" command becomes "show region name" to disambiguate
...
This is the same format as used by "show object name", etc.
"deregister region" also becomes "deregister region id"
2012-06-25 23:55:14 +01:00
f5316984ab
minor: update currently commented out log message at top of AvatarFactoryModule.SetAppearance() for future use
2012-06-25 23:31:22 +01:00
e5b739aaeb
When attachments are being saved and deleted for a closing root agent, delete first to avoid a hud race condition with update threads.
...
If delete doesn't occur first then the update thread can outrace the IsAttachment = false necessary to save attachments and send hud artifacts to other viewers.
2012-06-25 22:48:13 +01:00
5301648cff
In AttachmentsModule.DetachSingleAttachmentToInvInternal(), remove attachment before changing properties for correct inventory serialization.
...
Serialization of attachments requires IsAttachment = false so that correct positions are serialized instead of avatar position.
However, doing this when a hud is still attached allows race conditions with update threads, resulting in hud artifacts on other viewers.
This change sets SOG.IsDeleted before serialization changes take place (IsDeleted itself is not a serialized property).
LLClientView then screens out any deleted SOGs before sending updates to viewers.
2012-06-25 21:08:19 +01:00
9ca9770cf6
fix a seg fault in sp.cs
2012-06-25 00:44:09 +01:00
6d3ee8bb39
Fix script "Running" behavior
...
Unchecking "Running" box in script editor now persists. This fixes http://opensimulator.org/mantis/view.php?id=6057
2012-06-23 04:15:14 -04:00
78143769bf
Resolve various race conditions between accessing and removing external script URLs by more consistently locking on m_UrlMap
2012-06-22 23:49:52 +01:00
dca04c7b61
Avoid a race condition where an incoming request to a script external URL can trigger an exception is the URL was being removed at the same time.
...
This involves three steps
1) Return gracefully in UrlModule.HttpRequestHandler() instead of throwing an exception when the url cannot be found in its index
2) Return true instead of false in HasEvents() if no matching request is found in the map. This call will only happen in the first place for raced requests.
3) Return a 404 in GetEvents() if the request is not in the index, rather than a blank 200 OK.
Many thanks to Tom Haines in http://opensimulator.org/mantis/view.php?id=6051 for doing some of the work on this.
2012-06-22 23:16:18 +01:00
1468b01afc
coment out some of previus debug messaged before forgetting about them...
2012-06-22 18:29:46 +01:00
0de3ad5307
more debug
2012-06-22 18:18:12 +01:00
646b7fb8f2
i more debug
2012-06-22 18:10:53 +01:00
ba58d7a9b2
add a temp debug message
2012-06-22 18:04:12 +01:00
80a41e670d
Avoid race condition between m_PrimObjects iteration in XEngine.PostObjectEvent and places where the list is modified by extending the m_PrimObjects lock.
2012-06-22 02:23:25 +01:00
9f3feeff8d
If starting scripts on initial sim start, provide INFO level log feedback each time 50 scripts have been started.
...
This is to provide an indication of what's happening now that the default isn't to report every single script start.
Changes XEngine logging level in OpenSim.exe.config from WARN to INFO.
2012-06-22 02:10:27 +01:00
f907182ab2
Eliminate unnecessary extra call to TriggerEmptyScriptCompileQueue in XEngine.DoOnRezScriptQueue()
...
The later invocation of this function will happen on an empty compile queue.
2012-06-22 01:57:14 +01:00
4cf49369b5
Stop flicking IsAttachment false and then true in AttachmentsModule.UpdateAttachmentPosition() in order to avoid a hud update race condition.
...
Previously, setting IsAttachment to false then true was necessary to serialize the updated attachment object information.
However, UpdateAttachmentPosition no longer does this update.
Whilst IsAttachment is set to false there is a race condition where the update thread can wrongly send hud object updates to clients that do not own the hud, resulting in screen artifacts.
2012-06-22 01:43:26 +01:00
fda39c11bf
Fix bug where attachments would not retain position if just rotated and not moved.
...
This was because we were not setting AttachedPos in SOG.UpdateGroupPositionPR, unlike UpdateGroupPosition
2012-06-22 01:33:27 +01:00
798846c5b6
refactor AttachmentsModule tests to use a common method for standard attachment item setup
2012-06-22 00:40:04 +01:00
06617ffd06
Add regression test for updating attachment position
2012-06-22 00:18:30 +01:00
c8f7cd60cd
fix turning off phanton always decreasing number of physical parts
2012-06-21 19:05:36 +01:00
909572ed86
fix SceneGraph Add/Remove PhysicalPrim counters
2012-06-21 09:40:51 +01:00
d24122b706
Add item id, name, prim name and id to log message when state exists but loading fails.
...
Drop logging about memory limit exceeded to warn from error
2012-06-21 02:24:44 +01:00
afcabf5244
Retrigger build - last jenkins run was glitched
2012-06-21 02:13:03 +01:00
5709bed548
Add state file location to errors logged when there's some issue with retrieving state (e.g. exceeds memory limit)
2012-06-21 02:09:14 +01:00
eab211f94d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-06-21 01:10:13 +01:00
68ea096f1b
Use HasPrivateAttachmentPoint properties in SOG.DeleteGroupFromScene() instead of magic numbers
2012-06-20 23:25:07 +01:00
714db90832
refactor: use SOG.HasPrivateAttachmentPoint in SOP.SendTerseUpdateToClient() instead of attachmentpoint magic numbers.
2012-06-20 22:46:01 +01:00
b23425c7c4
As with LLSDInventoryItem from commit 01a2b0b, send type values in LLSDInventoryFolder for inventory CAPs as integers rather than strings.
...
Should also resolve some issues with exceptions being thrown in some inventory fetches.
2012-06-20 02:28:00 +01:00
9ec9dafae6
Lower warn logging on not having friends/group module on permissions to debug.
...
It's a valid configuration not to have these modules, but I think it's still worth logging the fact that certain permissions won't work (always return true)
2012-06-20 01:33:25 +01:00
6c312bce7f
minor: Lower flotsam asset cache warning about not having a FlotsamCache.ini to debug
...
It's perfectly okay not to have this section.
2012-06-20 01:30:20 +01:00
4cfaa01c0a
Remove STARTUP COMPLETE message from the startuplogo.txt file and into main logging
2012-06-20 01:06:55 +01:00
6b3f9fcde0
Comment out the neighbour and land in connectors from info logging that they are starting up
2012-06-20 00:42:54 +01:00
625e5e913a
Comment out recently added log message detailing number of scripts started when compile queue empties for now
2012-06-20 00:25:18 +01:00
881e92a726
Raise some IO associated Exception logging in XEngine to error level, in line with other similar cases.
...
Remove more unnecessary Close() calls - these are being triggered by the Dispose() called when exiting the using statement for these sdk io objects.
2012-06-20 00:19:50 +01:00
0fa303b1cf
Log how many scripts are candidates for starting and how many are actually started.
...
Adds DebugLevel infrastructure to XEngine though currently commented out and unused.
2012-06-20 00:10:19 +01:00
9737e6d52e
If RegionReady is active, don't falsely say that logins are enabled in the main scene loop before RegionReady is signalled when initial script compilation finishes.
...
Also raises this logging level to Info from Debug since this information is of high importance. This matches the behaviour of the RegionReady module
2012-06-20 00:07:03 +01:00
e23d7ff9c0
minor: If logging because mesh/sculpt data isn't present for an object, log object UUID rather than local id, since UUID doesn't potentially vary between simulator starts.
2012-06-20 00:05:48 +01:00
ef686ead37
Like the assembly and text files, only write the c#-lsl linemap in XEngine.SetXMLState() if the trust binaries flag is set.
...
This doesn't affect other locations where the map is written, such as on script compilation.
2012-06-19 02:11:46 +01:00
8e7032ece8
minor: Add a little more detail to IOException logging in XEngine.SetXMLState()
...
Also removes superflous Close() commands for statements taking place within using() constructs
Also adds some comment out debug log messages for future use.
2012-06-19 01:53:50 +01:00
ca22feb09a
don't send a lot of avatar data when we are just changing position or rotation ( SendTerseUpdateToAllClients() in place of SendAvatarDataToAllAgents() )
2012-06-17 13:28:33 +01:00
8cf414ba32
*CHECK/REVIEW* comented out not used sp.ParentPosition. Comented out SOG.AbsolutePosition changing 'linked' avatars positions ( reason in code coment )
2012-06-17 11:38:40 +01:00
e7aceae3e0
split ugly expression in a if making it simpler to read
2012-06-17 09:06:25 +01:00
e2b9a5d7aa
Don't let scripts rotate root part of physical linksets like SL, Update client rotation of avatars 'linked' to child parts. (put back some 'cosmetics' from previus commit). Still let lsl api use physics engine ideia of part Physical state on this where it should be SOP ideia, so is that is clear that sync with engine is SOP responsability.
2012-06-17 08:54:39 +01:00
7119de56ff
Change read config paramter from max_urls_per_simulator to max_external_urls_per_simulator, which is what it was meant to be
2012-06-16 04:12:53 +01:00
ed513fc7be
Fix bug introduced in commit c6e3752 (13 Jun 2012) where poll responses would always return OK even if some other status code had been set
2012-06-16 03:43:45 +01:00
22f25dfcab
Implement max_external_urls_per_simulator setting in [LL-Functions] to allow configuration of how many urls can be set up by llRequestURL()
...
Defaults remains as 100.
This setting is per simulator instead of per region due to how the url script module is structured.
2012-06-16 03:32:47 +01:00
32cc9c6094
Merge branch 'master' into careminster
2012-06-15 15:59:49 +01:00
ff21007b93
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-06-15 15:48:34 +01:00
ffc0badaf4
Reapply the one change that was in the revert that was actually function, not
...
form
2012-06-15 15:18:57 +02:00
5d32979170
Revert changes...
...
This reverts commit c8227e1bb7
2012-06-15 14:31:35 +01:00
db2dcbbe2d
SL doesn't let scripts rotate root part of physical linksets also fix sitting avatars rotations broken in previus commit, forcing send of updates.
2012-06-15 14:10:16 +01:00
065cda3711
Add sop IsPhysical and IsPhantom to be used gradually in core in place of asking physics engines all the time. Some engines delays may make them give wrong answers.
2012-06-15 12:19:42 +01:00
c8227e1bb7
only rotation of root part change parts positions, so only call ResetChildPrimPhysicsPositions() if root part. Plus 'cosmetics'
2012-06-15 11:24:37 +01:00
aaa30dcebc
Add region name to UseCircuitCode log messages
2012-06-15 05:01:36 +01:00
c935f03467
Put all debug console commands into a single Debug section rather than scattering them over other categories
2012-06-15 03:32:43 +01:00
30d872caad
Merge branch 'master' into careminster
2012-06-15 02:53:34 +01:00
ca4e6d9b5b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2012-06-15 02:52:56 +01:00
94517c8d5c
Make the "debug http" command available for robust as well as the simulator. This allows one to see incoming requests as they happen.
...
This required making everything use the common MainServer class for registering and retrieving http servers, rather than duplicate structures.
2012-06-15 02:51:52 +01:00
257b1b517d
Add main instance to internal MainServer.m_Servers list to simplify internal logic.
...
This does require the server to be added before it is set as the main Instance
2012-06-15 02:03:50 +01:00
aeed4d3041
minor: Tell user the current debug http level if "debug http" console command is executed without a level parameter
2012-06-15 01:27:29 +01:00
478acfff34
When setting debug http level, do this for all known http servers, not just the main instance.
2012-06-15 01:24:36 +01:00
10e87f9cdc
Make XMLRPCModule use an existing HTTP server if one already exists on the desired port.
2012-06-15 00:59:53 +01:00
6993a26ba5
Get rid of some unnecessary null checks in RegionApplicationBase.StartupSpecific() - a constructor can never return null.
...
Also adds some method doc to MainServer
2012-06-15 00:40:12 +01:00
93ba0332c4
minor: Extend 'debug http' usage statement to 0..3 from 0..2
2012-06-14 23:54:12 +01:00
9825861f4a
Shuffle "debug http" levels so that 1 and 2 now cause different levels of warn to be logged if we receive invalid xml for xmlrpc.
2012-06-14 23:46:09 +01:00
f4b02f8e39
Fix a regression in BaseHttpServer.HandleXmlRpcRequests() from recent c6e3752
...
Accidentally make responseString null by default instead of String.Empty.
It needs to be something in case the XmlRpcRequest deserialize throws an exception due to bad xml (a failure which we silently swallow!)
2012-06-14 04:29:15 +01:00
2c6555021f
Fix very recent regression in 917d753 where I put the ++updatesThisCall outside the batching part of ProcessEntityUpdates()
...
This stopped any batching happening and since this method is called periodically updates were sent very slowly
2012-06-14 03:49:54 +01:00
3888b9a670
If we're going to discard a terse update block because it's now someone else's hud, then don't still add it to the list of blocks for the update message.
2012-06-14 03:32:44 +01:00
1aa7469253
correct wrong incomplete comment from previous commit 3c3ea19 in AttachmentsModule
2012-06-14 02:30:40 +01:00
3c3ea19620
Fix a bug where scene objects attached as HUDs through scripts would not disappear for other avatars.
...
We do this by sending a kill message for that object to all other avatars apart from the one that has the hud.
2012-06-14 02:26:38 +01:00
0d2243a393
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-06-14 01:38:41 +01:00
917d753f1c
Fix a race condition where an object update for a hud could be sent to non-owner avatars if the hud was attached directly from within the region.
...
If this happens, then the non-owners would see unremovable huds that they did not own until relog, and sometimes even beyond that.
This was due to a race between the entity update and the attachment code when moving an object from within scene to a hud.
2012-06-14 01:36:37 +01:00
a4290048e5
Add SOG.HasPrivateAttachmentPoint to tell if a SOG has a private attachment point. HUDs attachment points are private.
...
Change SOP.SendFullUpdateToClient() and SoundModule.PlayAttachedSound() to use this rather than different magic number formulations.
This also corrects a bug in PlayAttachedSound() where the code assumed that all attachment points over 30 were HUDs.
It appears this is no longer true with Neck and Root (Avatar Center)
2012-06-14 01:20:55 +01:00
cba8b4f8b8
Fix not sending TransferInfo when an asset is not found. This clogs
...
up the sound pipeline in the viewer.
2012-06-14 00:58:17 +01:00
36117e079a
Merge branch 'master' into careminster
2012-06-14 00:57:05 +01:00
6a77a65675
minor: remove unnecessary IsAttachment = false setting for new object in UploadObjectAssetModule, property always starts as false
2012-06-14 00:35:26 +01:00
d893e54f4b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-06-14 00:10:52 +01:00
16ffc764bf
minor: refactor part of LLClientView.ProcessEntityUpdates() to remove duplicate code
2012-06-13 23:54:32 +01:00
cf080a68d6
Remove long obsolete and unused IClientAPI.KillEndDone()
2012-06-13 23:42:22 +01:00
f726150afd
Add ObjectUpdate as one of the packets that can be screened out when setting debug packet level
2012-06-13 23:39:23 +01:00
aac80550e0
Merge branch 'avination' into ubitwork
2012-06-13 05:16:18 +01:00
7bd274b3d3
Changed t adding the avatar dependent sit offset and not subtracting, so not to break inworld contents. SL ported scripts will show a sit error around 0.1m. Added respective compensation in LSL api to maintain coerence. Fixed several bugs still on SET/GET[link]PrimitiveParams[fast] and llGetObjectDetails()
2012-06-13 04:59:09 +01:00
1f34c8277d
In the osGetGrid functions, if the [GridInfo] section does not exist then return "Configuration Error", as already happens if there is no GridInfoURI
2012-06-13 04:05:02 +01:00
66cb533f26
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-06-13 03:51:13 +01:00
5145356467
Add "deregister region" by uuid command to grid service to allow manual deregistration of simulators.
...
Useful if a simulator has crashed without removing its regions and those regions have been reconfigured differently
2012-06-13 03:49:22 +01:00
b30c23eba4
convert a LSL rotation of <0,0,0,0> to <0,0,0,1> and not <0,0,1,0> in SitTarget. Something seems to be doing that before this gets called, but just in case...
2012-06-13 02:50:39 +01:00
4e18e71089
Committing the Avination implementation of llCastRay. This is a complete rewrite
...
wich does it's thing independently of physics. Enjoy!
2012-06-13 02:32:25 +01:00
94bbbf96c7
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-06-13 02:25:42 +01:00
12621201ba
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
2012-06-13 02:15:12 +01:00
4027c8e9c9
Fixed llGetObjectDetails(), OBJECT_ROT for sitting avatars case, plus 'cosmetics' and added some parts costs information.
2012-06-13 01:51:22 +01:00
b4ab9a7350
*TEST this will affect inworld sittargets by +-0.1m, so may be very BAD *. Changed the sign of the sitoffset dependent on avatar size in SP.cs. Removed that offset correction from SET/GET..primitiveParams in LSL api. If the sign needs to be the previus one, then all references to avatar positions on LSL api need to be fixed with that correction, not only SET/GETprimitiveParams.
2012-06-13 01:26:15 +01:00
ff450d29da
Add detecting non-physical phantoms back into raycast
2012-06-13 01:59:54 +02:00
c6e375291a
Don't include time to transmit response back to requester when assessing slow handling of requests.
...
This is to avoid logging a 'slow' request when the source of delay is the viewer in processing a response.
This is not something we can do much about on the server end - it's server-side delay that we're interested in.
To ensure consistency, this commit also had to refactor and simplify inbound non-poll network request handling, though there should be no functional change.
IOSHttpResponse no longer exposes the Send() method, only classes in OpenSim.Framework.Servers.HttpServer should be doing this.
Only the GetTextureHandler was sending its own response. Now it leaves this to BaseHttpServer, like all other core handlers.
2012-06-13 00:03:44 +01:00
c53c55fed0
Add variable timer configureation for the timer_Script
...
Added "timer_Interval" to the OpenSimDefaults.ini, leaving the default value set to 1200, as the previous default setting. The value represents seconds. To change the default, copy the entry to OpenSim.ini and multiply the number of minutes for the interval by 60.
2012-06-12 17:15:56 -04:00
f51ef99bd5
try to replicate SL bug of PRIM_ROTATION also for avas, est a fix to other cases
2012-06-12 08:05:40 +01:00
5784b3eb31
fix the try.. finally in SetPrimitiveParams i did mess and add one for the avatars case, so to optimize a bit 'warp' scripts.
2012-06-12 05:57:28 +01:00
8b5342f613
more changes to Get and Get primitiveparams: Let Get remove avatarheight adjust,add Get PRIM_LINK_TARGET handling, changed avatar Set positions code...
2012-06-12 05:21:49 +01:00
dfafb5ca14
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-06-12 03:09:52 +01:00
2ca31a9841
Remove accidental timeout left in during earlier debugging. Has been in since two commits ago ( b099f26)
2012-06-12 02:46:14 +01:00
1b1f0a2d77
OnConnectionClosed listeners, retrieve data from IClientAPI.SceneAgent rather than scanning all scene for the presence with the right id
...
Stop checking IsLoggingOut on these listeners, if called with a root agent then we always want to perform these actions.
This covers cases where the client is closed due to manual kick, simulator shutdown, etc.
2012-06-12 02:43:33 +01:00
5fd6f678a4
Moved auxiliar funtions of last commit from sop to lsl api since they are only used on one place each
2012-06-12 02:20:47 +01:00
b099f26376
Set IClientAPI.IsActive = false early on client removal due to ack timeout rather than using IsLoggingOut flag.
...
IsActive is more appropriate since unack timeout is not due to voluntary logout.
This is in line with operations such as manual kick that do not set the IsLoggingOut flag.
It's also slightly better race-wise since it reduces the chance of this operation clashing with another reason for client deactivation (e.g. manual kick).
2012-06-12 02:16:36 +01:00
c89db34fc4
If the simulator closes a root agent due to ack timeout, then send the client a kick message with that reason, in case it is somehow still listening.
2012-06-12 02:03:31 +01:00
24e8e5d818
*UNTESTED* extended llGet*PrimitiveParam() to support avatars. Some auxiliar code in SOP.cs
2012-06-12 01:26:03 +01:00
8c7149063b
In PresenceDetector.OnConnectionClose(), use the IsChildAgent check already available on IClientAPI.SceneAgent rather than retrieving it again by scanning all scenes.
2012-06-12 01:25:09 +01:00
bab7dab4c5
Comment out the scene presence sitting debug log messages for now
2012-06-11 23:37:16 +01:00
daad0a3e11
Revert "Bind ~ and ! operators in LSL tighter in order to resolve issues in LSL where these aren't evaluated propertly."
...
This reverts commit a8a9d13dc0
2012-06-11 23:30:58 +01:00
a927787434
Add last frame time monitor to MonitorModule now that this value is useful
2012-06-11 23:30:11 +01:00
cbb5ddd944
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-06-11 23:27:48 +01:00
76a9885ad2
Merge branch 'master' into careminster
2012-06-11 23:15:38 +01:00
cd49949478
change object drag so it applies a impulse and not a push force so it works as before my fix to impulse/forces
2012-06-11 22:43:35 +01:00
d151b334fa
Merge branch 'avination' into ubitwork
2012-06-11 19:39:00 +01:00
84377a23db
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Framework/Interfaces/ISimulationDataService.cs
OpenSim/Services/Connectors/Simulation/SimulationDataService.cs
OpenSim/Tests/Common/Mock/MockRegionDataPlugin.cs
2012-06-11 16:56:40 +01:00
71ba85137f
Commitig the Avination implementation of llTeleportAgent and
...
llTeleportAgentGlobalCoords. These do NOT use PERMISSION_TELEPORT like
their SL counterparts because that permission is not yet understood by TPVs
based on v1.x.
2012-06-11 16:45:52 +01:00
8c91e761c8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-06-09 16:28:22 +01:00
a8a9d13dc0
Bind ~ and ! operators in LSL tighter in order to resolve issues in LSL where these aren't evaluated propertly.
...
Addresses http://opensimulator.org/mantis/view.php?id=3268
2012-06-09 05:11:08 +01:00
817f2d341d
Fix regression in 5f4f9f0 (Fri Jun 8 2012) which stopped "show stats" and json stats from working
2012-06-08 23:36:53 +01:00
853449d5bc
Make llTeleportAgent conform to Magnum SL Server and add llTeleportAgentGlobalCoords()
2012-06-08 23:37:25 +02:00
efff5a7c0d
Fix a corner case where checking for region corssing may cross an avatar back if
...
it's pending to be sat onto a vehicle that is in the process of crossing.
2012-06-08 18:25:36 +02:00
1eee525c88
Revert "Add a frame based watchdog function to keyframed motion"
...
This reverts commit 2d98d6354c
2012-06-08 16:54:47 +02:00
22437af26a
*UNTESTED* fix PRIM_LINK_TARGET. Make it work on avatars, set any pending position change on others; don't assume m_host is in same grp that part (possible always is)...
2012-06-08 15:48:46 +01:00
f0a6ec151a
*UNTESTED* let SetPrimParams for avatars parse even unsupported parameters so that if a supported one is in the middle of then it still works.
2012-06-08 15:27:21 +01:00
9d878591c8
*UNTESTED* added PRIM_POS_LOCAL and PRIM_ROT_LOCAL in SetPrimParams for avatars. Stopped setting position twice in normal SetPrimParams
2012-06-08 14:29:02 +01:00
dadac6816b
Merge branch 'ubitwork' into avination
2012-06-08 15:15:17 +02:00
2d98d6354c
Add a frame based watchdog function to keyframed motion
2012-06-08 15:14:38 +02:00
794d184c25
Stop sending a DisableSimulator packet in LLClientView.Close(), which is a duplicate for child agents and unnecessary for root agents.
...
Close() already calls Scene.RemoveClient() which sends the right eq or udp DisableSimulator message to child agents.
2012-06-08 04:32:51 +01:00
f94b92df46
Instead of retrieving the known client again in LLUDPServer.RemoveClient(), check the IsLoggingOut flag instead.
...
This is slightly better thread-race wise
2012-06-08 04:12:22 +01:00
c215b1ad16
If logging a client out due to ack timeout, do this asynchronously rather than synchronously on the outgoing packet loop.
...
This is the same async behaviour as normal logouts.
This is necessary because the event queue will sleep the thread for 5 seconds on an ack timeout logout as the client isn't around to pick up the final event queue messages.
2012-06-08 03:53:03 +01:00
5f4f9f0230
Add regression test for client logout due to ack timeout.
2012-06-08 03:12:23 +01:00
d73805d7f4
Remove null checks at top of LLUDPServer.ProcessInPacket(). Neither packet nor client are ever null.
2012-06-08 01:51:28 +01:00
d71c6dea7e
Store already retrieve IClientAPI in IncomingPacket structure for later use rather than doing another retrieve on dequeue.
...
Instead of checking whether the client still exists by trying to retrieve again from the client manager, this patch gets it back from IncomingPacket and checks the IClientAPI.IsActive state.
2012-06-08 01:43:58 +01:00
30f4a33f01
Don't make duplicate call to ScenePresence.Close() separately in ETM.DoTeleport() if an agent needs closing.
...
This is always done as part of Scene.RemoveClient()
Also refactors try/catching in Scene.RemoveClient() to log NREs instead of silently discarding, since these are useful symptoms of problems.
2012-06-08 01:26:43 +01:00
8ebe2cd3da
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-06-08 01:12:37 +01:00
5c162ccd57
Go back to calling IncomingCloseAgent() in the "kick user" command for consistency instead of IClientAPI.Close() directly.
...
This no longer double counts child agent removals
2012-06-08 00:59:39 +01:00
48add77a4c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-06-08 00:43:39 +01:00
d547bcf8d1
Remove duplicate update of user count in Scene.IncomingCloseAgent()
...
This is already done in Scene.RemoveClient() which IncomingCloseAgent() always ends up calling.
2012-06-08 00:40:38 +01:00
b56673c920
Fix bug with "kick user" reducing agent counts by 2 instead of 1.
...
This is done by making the kick user command call IClientAPI.Close() rather than routing through Scene.IncomingCloseAgent(), which also called IClientAPI.Close()
DisableSimulator for child agents is moved from IncomingCloseAgent() to RemoveClient(), this is not a functional change since IncomingCloseAgent() always ends up calling RemoveClient()
2012-06-08 00:18:25 +01:00
c5af3e384c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2012-06-08 00:14:39 +01:00
0c5fefacb4
Record the fact that child agents can have asset transactions.
...
Also change code to grab the agent asset transaction module once.
2012-06-07 23:51:04 +01:00
de87e4871b
Don't send kill object messages to clients when a child agent is closed.
2012-06-07 23:35:21 +01:00
69dd5b855a
Merge branch 'avination' into careminster
2012-06-07 23:34:22 +01:00
e8cd9fbbb7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-06-07 23:33:40 +01:00
038acc39be
Cut off collision sounds with avatar at 3.2. This makes most walkig collisions
...
with walls and stairs silent. Falls from greater height and running into things
will still be heard. a CollisionSound defined for the object will override this
so one can still script a soccer ball with sounds.
2012-06-08 00:09:30 +02:00
ad1df33006
Further limit the amount of avatar collisions that will actually trigger
...
sounds. They are distracting.
2012-06-07 23:41:10 +02:00
b700f58d5e
Typo fix
2012-06-07 23:41:00 +02:00
26c5b32988
Add the ability to query the MYSQL databse for a list of the stored prim UUIDs
2012-06-07 22:39:03 +02:00
4942314435
Implement playing of the real collision sounds, change scaling for avatar
...
collisions to make them really soft because otherwise climbing stairs
makes an unbearable amount of noise.
2012-06-07 20:51:03 +02:00
095dbf0ece
Fix not sending TransferInfo when an asset is not found. This clogs
...
up the sound pipeline in the viewer.
2012-06-07 19:51:32 +02:00
f5cbe56c56
Make not_at_target stop when the target is reached even if the script
...
is not listening to at_target
2012-06-07 19:01:33 +02:00
31bc9c3ad3
Typo correction
2012-06-07 18:04:09 +02:00
64aefe9c28
Disable default collision sounds until they can be uploaded, but enable custom ones
2012-06-07 17:59:38 +02:00
91557f18cd
Set collision sound type so custom sound types are recognized
2012-06-07 17:59:20 +02:00
e93308072e
Make the "delay restart" button delay restart for 1 hour rather than aborting
...
it altogether. Allow a maximum of three uses before the restart goes through.
2012-06-07 16:32:07 +02:00
a1e857932a
Make change to fix Windows builds
2012-06-07 10:17:37 -04:00
7550b97e65
Log warning if we try to remove a UDP client that has already been removed.
2012-06-07 04:00:29 +01:00
98b46d48fe
Allow the thread watchdog to accept an alarm method that is invoked if the timeout is breached.
...
This alarm can then invoke this to log extra information.
This is used in LLUDPServer to show which client was being processed when incoming and outgoing udp watchdog alarms are triggered.
2012-06-07 02:44:13 +01:00
a945105003
Make timed bans / timed passes work as expected. Prevent transmission of media
...
URLs to banned clients.
2012-06-07 00:24:33 +02:00
5876a4d392
Prevent a null ref when getting the velocity of an avatar during login or
...
logout.
2012-06-07 00:24:07 +02:00
b02db11c69
Remove a null ref when an avatar's attachment gets the avatar velocity
...
while the avatar is logging in or out.
Also remove some unlocking calls without matching locking call. Merge
artefact cleanup, again.
2012-06-06 20:38:42 +02:00
a12336390f
Remove useless logging of a bare-names stack trace. It's meaningless
...
to a non-programmer and insufficient for a programmer.
Add commented debug output and data collection to troubleshoot
future locking issues.
2012-06-06 20:37:29 +02:00
67483a6e50
Remove two causes of recursive locking. Merge artefact cleanup.
2012-06-06 20:36:47 +02:00
e09a74493f
Reverse the logic of a conditional. Clears up a merge artefact.
2012-06-06 20:35:37 +02:00
34cb8a2ab3
Fix not sending TransferInfo when an asset is not found. This clogs
...
up the sound pipeline in the viewer.
2012-06-06 20:35:00 +02:00
c0b21d92c2
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-06-06 14:16:19 +01:00
e733fb32cf
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2012-06-06 13:07:05 +01:00
514dd85199
minor: Change log messages on Warp3DImageModule to show they are from this module
2012-06-06 04:18:38 +01:00
53c25a4778
Rename MapImageModule for Warp3D to Warp3DImageModule to match its class name and make it easier to distinguish between map image modules.
2012-06-06 04:15:00 +01:00
2b0de66216
Actively dispose of Bitmaps in Warp3D image module and world map module once we've finished with them.
...
This might help with memory leakage issues though I suspect it won't.
2012-06-06 04:11:16 +01:00
3b25021180
enabling all corners of a sim to be set in one call
2012-06-06 02:47:47 +01:00
abf94627f6
Ensure closure of bitmap and memory stream with using() statements in WorldViewModule.
...
If this has any effect then it will only be to the map images returned via requests to the /worldview simulator HTTP path (not enabled by default)
2012-06-06 02:45:36 +01:00
6adc810eaa
Stop accidentally reading 4 Int16s instead of 2 in SIZE section of Terragen file when loaded from a stream.
...
Fixes a bug introduced 2 weeks ago in 67ebe80
2012-06-05 19:40:16 +01:00
bdc62144ae
fix the real cause of double velocity
2012-06-05 05:53:44 +01:00
372b76031b
revert last bad commit but fix recoil direction
2012-06-05 05:52:25 +01:00
768447e41b
Stop llRezAtRoot() from applying velocity setting impulse in World.RezObject, doing it only in itself, so its applyed after resuming scripts etc. It was giving twice the requested velocity.
2012-06-05 04:43:23 +01:00
a5410c2c19
minor: Add user feedback when executing fix-phantoms
2012-06-05 01:37:40 +01:00
42179578fc
Allow fix-phantoms command to appear even if CombineContiguousRegions = false, since this allows one to go back from a megaregion to normal regions.
...
Adapted from a patch by Garmin Kawaguichi in http://opensimulator.org/mantis/view.php?id=6027
Garmin says that fix-phantoms allows one to reset objects when going back from megaregion to normal regions as well as the othe rway around.
Thanks!
2012-06-05 01:33:58 +01:00
008c6a4610
Mantis 4597 AgentPaused packet is ignored.
...
The packet was actually being handled but not acted on.
This change extends the default timeout for paused clients to 5 minutes
and makes both the paused and non-paused timeout periods configurable.
2012-06-05 01:22:05 +01:00
170b820a11
Fix land collisions to work like SL.
2012-06-05 01:53:25 +02:00
01280e9b94
Remove unused ScenePresence list structure in llGetAgentList()
2012-06-05 00:34:18 +01:00
96d1ba90d7
Scale down per frame MS stats to match scaled simulator FPS stat.
...
This makes frame time stats properly tally with fps, which saves confusion and makes it easier to interpret numbers.
In some ways this is not so artifical - physics FPS runs at the higher rate.
2012-06-05 00:27:51 +01:00
655625ab87
Start sending spare frame time MS viewer stat. Make frame time correctly display total frame time, not just non-spare time.
...
This makes it easier to see when components of frame time exceed normal permitted frame time.
Currently reflect scene frame times.
2012-06-05 00:17:55 +01:00
c3d9acc9a9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-06-05 00:15:29 +01:00
a7f4804f53
Properly show per frame millisecond statistics per frame, not as amount of time taken per second.
...
This is to make these statistics actually match their names (and also be more accurate as number of frames can vary under heavy load)
Currently using scene frames (11.23 every second) instead of physics frames (56.18 per second)
2012-06-04 23:07:53 +01:00
3229e32b4e
Add replaceable region modules to the "show modules" command
2012-06-04 17:25:38 -04:00
fd176aab8f
Actually trigger land collisions in the root even when a child collides
2012-06-04 22:41:29 +02:00
1d75220fcc
Merge branch 'ubitwork' into avination
2012-06-04 21:09:42 +02:00
401b97788f
fix addforce/impulse.
2012-06-04 20:35:12 +01:00
28e5abd917
Fix llAttachToAvatar and "Attach" viewer option to preserve saved attach positions.
2012-06-04 21:05:56 +02:00
d9d4fb10d9
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-06-04 18:22:43 +01:00
f94ef37b46
Correct the delegate specification in EventManager.TriggerTerrainTainted. Looks like the wrong one was cut and pasted.
2012-06-04 10:26:39 -07:00
5c646e2603
Remove the "Profile" config as it's covered by the replaceable interface
2012-06-04 18:22:09 +01:00
207a5f17b5
When regions are set to shut down the instance, always send notifications to
...
all affected regions and disregard the region id parameter.
2012-06-03 13:43:39 +02:00
728249ba49
Merge branch 'master' into careminster
2012-06-03 02:36:28 +01:00
729d90173f
Fix build break whree accidentally did inv.Folders rather than inv.Folders.Count in a minor change.
2012-06-02 05:03:56 +01:00
2de5479c3f
minor: tidy up some comments
2012-06-02 05:01:56 +01:00
01a2b0b289
Fix various issues with http inventory
...
1) The return messages were being wrongly populated with the names of asset, inventory and sale types when their corresponding integers should have been used instead.
2) Folders with links were including the linked items in the descendents figure, when only the links should be included.
3) Links and linked items in link folders were not being included in the return data, and not in the correct order.
Now that these issues have been addressed, outfits and attachments appear to work consistently when HTTP inventory is enabled (as is now the default).
2012-06-02 04:57:10 +01:00
8e735efff0
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-06-02 02:01:48 +01:00
522f36345d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2012-06-02 01:40:42 +01:00
928e3e9e21
Fix LSL animation state reporting and animation state transitions on crossing
2012-06-01 23:04:28 +02:00
d8f6faa89e
Fix impersonation, it got broken in a merge
2012-06-01 23:04:13 +02:00
72219eae7d
Instead of updating sim stats root agent, child, objects and scripts accounts every single scene frame, update in the once every 3 seconds SimStatsReporter run
2012-06-01 04:47:11 +01:00
6375db1533
Add optional total avatars, total prims and active prims stats to ODE plugin.
...
These will act as a sanity check with the main scene stats, to show that physics scene entities are being managed properly.
Total prims will not match scene total prims since physics total does not include phantom prims
2012-06-01 04:23:36 +01:00
4e06a46dc5
If OdeScene.Near() returns no collision contacts, then exit as early as possible. All subsequent code is only relevant if there are contacts.
2012-06-01 04:07:39 +01:00
200376b3c4
Add optional stat for the other collision time per frame not spent in ODE native spaces or geom collision code
2012-06-01 03:49:42 +01:00
d34b84b531
Add avatar forces calculation, prim force and raycasting per frame millisecond optional stats
2012-06-01 03:23:19 +01:00
9ff8efc720
Collection optional avatar and prim taint frame millisecond times
2012-06-01 03:03:48 +01:00
d1b5f8d9d7
Remove recent optional native collision frame milliseconds stat
...
Unnecessary since this has now been broken down into space collisions and geom collisions
2012-06-01 02:35:11 +01:00
31343aa7c3
Add optional stat that records milliseconds spent notifying collision listeners in physics frames
2012-06-01 02:33:44 +01:00
5f44be99ef
Add avatar and prim update milliseconds per frame optional stats
2012-06-01 02:25:42 +01:00
5cc9b820e5
Add option native step frame ms stat
2012-06-01 01:58:28 +01:00
f2c8c7a7b8
Add total ODE frame time optional stat, as a sanity check on the main scene physics stat
2012-06-01 01:37:19 +01:00
8333b928fa
Break down native ODE collision frame time stat into native space collision and geom collision stats
2012-06-01 01:27:19 +01:00
c33c8db825
Rename new collision stats to 'contacts' - there are/can be multiple contacts per collision and this is what is actually being measured.
2012-06-01 01:15:27 +01:00
e1f8d2adb0
Stop adding an unnecessary duplicate _perloopcontact if the avatar is standing on a prim.
...
This has already been added earlier on in the method.
2012-06-01 01:12:30 +01:00
8301f7b17f
minor: comment out currently unused OdeScene.sCollisionData
2012-06-01 00:57:55 +01:00
93fa9e8991
Add ODE avatar and prim collision numbers if extra stats collection is enabled.
2012-06-01 00:56:13 +01:00
878b67b333
Fix OdeScene.GetTopColliders() to return the top 25 colliders rather than the first 25 that had non-zero collision scores.
...
Also zeros collisions scores on all prims after report collection, not just the top 25.
As before, this collision scores are only reset after a report is requested, which may give unrealistic numbers on the first request.
So to see more realistic scores, ignore the first report and then refresh the request after a couple of seconds or so.
2012-06-01 00:26:11 +01:00
4b3cb91ce8
Remove the kill record. Core has removed it long ago and it really does more harm than good these days
2012-06-01 00:12:04 +02:00
e696d1d952
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-05-31 03:37:43 +01:00
e80161753f
Merge branch 'master' into careminster
2012-05-31 03:35:24 +01:00
0b02a4d42e
Add an optional mechanism for physics modules to collect and return arbitrary stats.
...
If active, the physics module can return arbitrary stat counters that can be seen via the MonitoringModule
(http://opensimulator.org/wiki/Monitoring_Module )
This is only active in OdeScene if collect_stats = true in [ODEPhysicsSettings].
This patch allows OdeScene to collect elapsed time information for calls to the ODE native collision methods to assess what proportion of time this takes compared to total physics processing.
This data is returned as ODENativeCollisionFrameMS in the monitoring module, updated every 3 seconds.
The performance effect of collecting stats is probably extremely minor, dwarfed by the rest of the physics code.
2012-05-31 01:52:26 +01:00
cc903992dd
ubitode prim: if makebody() is called already having a body, do a full destrution so there are no 'leaks'.
2012-05-30 21:32:15 +01:00
c548f48791
Guard setting the building flag
2012-05-30 19:32:02 +02:00
0587079115
Whitespace fix
2012-05-30 19:25:52 +02:00
86f786d673
Prevent multiple requests to go physical from reaching the physics plugin
2012-05-30 16:10:01 +02:00
4358bb8f85
Fix the log standing attach-from-world bug.
2012-05-30 00:50:47 +02:00
bf0b8170f7
Add console command "teleport user" to allow teleport from the region console
...
See "help teleport user" on the console for more details
2012-05-29 23:35:20 +01:00
3e9a831e87
fix physics not reporting collisions only with terrain
2012-05-29 19:13:27 +01:00
b660c4991b
Fix collision filtering. The filter should be checked on the receiving part!
2012-05-29 18:18:47 +01:00
997d23c590
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2012-05-29 18:12:18 +01:00
100d2968c4
Add advanced collision processing into ScenePresence
2012-05-29 17:24:17 +02:00
c46b31a9b4
Re-add script collisions that were lost in a merge
2012-05-29 16:58:08 +02:00
10e9ad0086
Fix collision filtering
2012-05-29 16:56:04 +02:00
9129a0cce4
Merge branch 'avination'
2012-05-29 08:45:44 +02:00
79f3ce2e9f
refactor: factor out entity transfer state machine into a separate class to make code more analyzable
2012-05-28 23:06:00 +01:00
dbbfe0cdd7
fix avatars collisions on sim crossings and other few cases where freemove() is called
2012-05-28 22:23:32 +01:00
8f87f55d05
If handling the failure of teleport, move agent state to CleaningUp when we start the handling.
...
Also fixes the log warning from ResetInTransit() if the state is cleared direct from Transferring or ReceiveAtDestination, as pointed out in mantis 5426
2012-05-28 22:16:06 +01:00
2122c336b0
a bit cleaner code (?) on sculpts/meshs meshing checking
2012-05-28 14:44:06 +01:00
60cebe9a5b
let meshs work indenpendently of mesh_sculpted_prim config option
2012-05-28 14:32:16 +01:00
5141f4075f
Merge branch 'avination' into ubitwork
...
Conflicts:
OpenSim/Region/Framework/Scenes/CollisionSounds.cs
2012-05-28 13:13:01 +01:00
121433d03a
disable collision sounds for now
2012-05-28 13:10:02 +01:00
20baa6334c
revert making sculpts phanton if sculpt meshing option is off
2012-05-28 13:05:50 +01:00
b70fb7df78
Place the return back into collision sounds.
2012-05-28 11:28:46 +02:00
ca3b229e94
If a region is not found on a simulator, make the health query return
...
0 to indicate it's still starting rather than an error. There are other
methods that can discover the presence of a region and slow starting regions
may cause the watchdog to kill them while they start,
2012-05-28 09:15:24 +02:00
c5e73c0cb8
Merge branch 'ubitwork' into avination
2012-05-28 02:19:29 +02:00
bbaf450c30
Modify SceneManeger to use a DoubleDictionary and work without locks.
...
Changes to the scenes dictionary are exceedingly rare and using atomic
operations makes the chance of collisions nearly nil in any case.
2012-05-28 02:14:14 +02:00
78e657fd8d
Merge branch 'avination' into careminster
2012-05-27 19:35:36 +01:00
884c0e7bb1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-05-27 19:24:30 +01:00
f740c9522a
Let OOB information usable outside ubitode
2012-05-27 14:01:42 +01:00
7fd38788b4
minor: code formatting from 0b72f773
2012-05-26 02:14:32 +01:00
0b72f773c7
Mantis 6025 llRequestPermissions auto grant for NPCs.
...
If the script requesting permissions is owned by either the NPC or
the NPCs owner (if the NPC is created as owned) then grant any
permissions automatically.
2012-05-26 02:09:22 +01:00
43a6f28620
If restating a region, clean up the physics scene after the main scene has been closed not before.
...
If this is done before then on ODE agent update calls still incoming can fail as they try to use a raycastmanager that has been disposed.
Bullet plugin does nothing on Dispose()
However, I wouldn't be at all surprised if individual region restarting was buggy in lots of other areas.
2012-05-26 01:55:35 +01:00
33b66009e4
One can now get hyoergrid region co-ordinates with llRequestSimulatorData
2012-05-26 01:32:42 +01:00
d6476b6277
Use GetInventoryItem() in LSL_Api.InventoryKey(string name, int type).
...
Also removes small bug where calling this method would add 1 to LPS, evne though all callers already did this.
2012-05-26 01:03:53 +01:00
f2a5fad18f
Use SceneObjectPartInventory.GetInventoryItem() in OSSL.AvatarStopAnimation instead of searching the task inventory manually.
2012-05-26 00:54:00 +01:00
ff53add54d
refactor: replace LSL_Api.InventoryKey(string) largely with SceneObjectPartInventory.GetInventoryItem(string)
...
Also gets llStopAnimation() to call KeyOrName rather than duplicating logic.
2012-05-26 00:36:01 +01:00
120f8145fc
Mantis 6028 osAvatarStopAnimation not stopping animations via UUID
...
Corrected to stop animations using the animation UUID similar to llStopAnimation.
See http://opensimulator.org/wiki/OsAvatarStopAnimation
2012-05-25 23:45:03 +01:00
67ebe80dd9
Resolve some mono compiler warnings.
2012-05-25 04:03:16 +01:00
ab59c0a658
on agent cross, remove from physics scene after its been placed in transit, not before.
2012-05-25 03:39:10 +01:00
888210ea4a
refactor: make ETM.CrossAgentToNewRegionAsync neighbourRegion == null check return earlier to simplify method
2012-05-25 03:06:26 +01:00
9f1fc7ea88
Remove a call stack debugging line accidentally left in from a few days ago at SceneObjectPartInventory.ApplyNextOwnerPermissions().
2012-05-25 02:54:37 +01:00
96cde407ab
Fix bug where a failed QueryAccess to a remove region would always have the reason "Communications failure" no matter what the destination region actually returned
2012-05-25 02:37:22 +01:00
40c78b0624
Stop it being possible for an agent to teleport back to its source region before the source region has finished cleaning up old agent data and structures.
...
If this is allowed, then the client usually gets forcibly logged out and data structures might be put into bad states.
To prevent this, the binary state machine of EMT.m_agentsInTransit is replaced with a 4 state machine (Preparing, Transferring, ReceivedAtDestination, CleaningUp).
This is necessary because the source region needs to know when the destination region has received the user but a teleport back cannot happen until the source region has cleaned up.
Tested on standalone, grid and with v1 and v3 clients.
2012-05-25 02:02:53 +01:00
7cceab1295
In remote QueryAccess, also receive the actual status (true|false) instead of always true no matter what the callee actually returned.
...
This was due to two things
1) SimulationServiceConnector.QueryAccess was always looking to the outer result["success"].
But if a "_Result" map is returned (which is certainly the case right now), then the true success is _Result["success"], result["success"] is always true no matter what
2) If QueryAccess was false at the destination, then AgentHandlers.DoQueryAccess() was never putting this in the result.
The default action of SerializeJsonString() is not to put false booleans in the JSON!!!, so this has to be explicitly set.
2012-05-25 01:41:00 +01:00
93ff27053a
Don't actually proceed on a within-region teleport if another is already taking place, rather than just (falsely) logging that we're not going to proceed.
...
An oversight from recent commit 9ab0c81
2012-05-24 22:59:52 +01:00
cc53d91d2f
On inter-region teleport, only stand the avatar up if the QueryAccess call to the destination scene actually succeeds.
2012-05-24 22:46:45 +01:00
cd225215b1
Now that the EntityTransferModule is per-region, fetch the event queue module once rather than repeatedly via scene presences
2012-05-24 22:40:24 +01:00
5c9086ade6
Fix issue where a dns resolution failure on the final destination might leave the user unable to teleport since the transit flag was not being reset.
...
This moves the 'already in transit' check further up and resets the flag if dns resolution fails and in the new required places.
2012-05-24 22:26:02 +01:00
99cebec4ab
adding status codes from rfc 6585
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-05-24 12:09:15 -04:00
87f9aa9d08
porting IDE tooltip-friendly documentation tweaks from Aurora-Sim
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-05-24 12:09:15 -04:00
f4cd4c8e28
Comment out accidentally left in log line that was printing out the control file on OAR save
2012-05-24 04:33:36 +01:00
38ce9d45a5
Make ISimulationScene.GetScene() used the more efficient region id for lookup rather than the region handle.
2012-05-24 01:00:18 +01:00
459c7635af
If an agent is still registered as 'in transit' by the source region, don't allow an immediate teleport back.
...
This is to help relieve a race condition when an agent teleports then immediately attempts to teleport back before the source region has properly cleaned up/demoted the old ScenePresence.
This is rare in viewers but much more possible via scripting or region module.
However, more needs to be done since virtually all clean up happens after the transit flag is cleared .
Possibly need to add a 'cleaning up' state to in transit.
This change required making the EntityTransferModule and HGEntityTransferModule per-region rather than shared, in order to allow separate transit lists.
Changes were also required in LocalSimulationConnector.
Tested in standalone, grid and with local and remote region crossings with attachments.
2012-05-24 00:31:14 +01:00
bc543c1797
Environment Module - allows Environment settings for Viewer3 warning: includes database region store migrations for mssql, mysql, sqlite
...
enable/disable this module:
Cap_EnvironmentSettings = "localhost" (for enable)
Cap_EnvironmentSettings = "" (for disable) at ClientStack.LindenCaps section (OpenSimDefaults.ini file)
or owerwrite in OpenSim.ini
mantis: http://opensimulator.org/mantis/view.php?id=5860
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-05-23 17:04:19 -04:00
b490050165
Format cleanup
2012-05-23 16:58:04 -04:00
682d4075e3
Fix llGetSimulatorHostname to return configured hostname
2012-05-23 15:08:39 -04:00
4d1986c0e4
minor: Change [OBJECT COMMANDS MODULE] log strings to [REGION COMMANDS MODULE] strings, though all these are currently commented out anyway
2012-05-23 04:20:54 +01:00
ee98b9c394
Add "show scene" command which lists stats for the currently selected console scene(s)
...
This includes prim count, script count, avatar count, etc.
Information is currently the same as "show stats", though show stats can only show one scene at a time because it listens for the latest outgoing stats packet (a bad approach that needs to change).
Might be better to tie this module into the other stats module to display arbitrary stats rather than fetching directly from scene.SimStatsReporter.
Console command is "show scene" because "show region" already exists for the grid service, which is unfortunate.
Might need to make a distinction between "scene" relating to a live scene and "region" relating to more static region data (url, coords, etc.)
2012-05-23 04:10:45 +01:00
8f88c17df9
refactor: Rename ConsoleTableRow and ConsoleTableColumn to ConsoleDisplayTableRow and ConsoleDisplayTableColumn
2012-05-23 03:23:37 +01:00
059a1e90b9
Add ConsoleDisplayList for more consistent formatting of console output in list form.
...
Convert "show region" to use this structure rather than hand-constructing
2012-05-23 03:19:25 +01:00
2222d979cc
refactor: rename ConsoleTable -> ConsoleDisplayTable for clarity
2012-05-23 02:37:38 +01:00
c6ce41bfba
Add missing Y co-ord in "show region" console command information
2012-05-23 02:31:53 +01:00
050007b44d
Lay out "show region" information in an easier to read line by line format
2012-05-23 02:30:16 +01:00
68918d632f
Fetch the dialog module reference in AttachmentsModule in RegionLoaded() not AddRegion()
...
The reference is not guaranteed to be there when AddRegion() is called but will definitely be present at RegionLoaded() if it's going to be present at all.
2012-05-23 02:09:31 +01:00
ec8745cf51
minor: Make log class names in InventoryAccessModule uniform
2012-05-23 02:05:48 +01:00
ff429a259b
Fix bug where an avatar that had an object they owned attached through llAttachToAvatar() or osForceAttachToAvatar() would wrongly have next permissions come into play when they detached that object and rezzed it in scene.
...
This is because the attachments module code was setting the 'object slam' bit by using PermissionMask.All
Solution here is to route the attachment item creation call through the existing inventory code in BasicInventoryAccessModule rather than copy/pasted code in AttachmentsModule itself.
2012-05-23 01:58:10 +01:00
9ab0c81c1d
Setting 'in transit' on a local teleport as well as inter-region teleports.
...
This is to eliminate possible race conditions if two teleport calls are made concurrently, where at least one is a local teleport.
This is pretty much impossible on a manual user teleport but can happen on script-invoked teleports.
2012-05-21 21:33:59 +01:00
7e97f0e898
minor: extend commented out LinkInventoryItem log message for future use
2012-05-21 21:00:22 +01:00
16d303f7cd
Fix bug where outfit folders could not be renamed.
...
Outfit folders are a type of system folder whose details are allowed to change.
2012-05-21 19:38:43 +01:00
d2260423e5
also don't collide sculps or meshs if meshing is OFF
2012-05-21 17:11:19 +01:00
b92ecc5382
Merge branch 'avination' into ubitwork
2012-05-21 12:47:28 +01:00
85f5789993
try to let avas climb higher steps. Will only work in some cases, may have bad effects, so needs some more testing
2012-05-21 12:35:17 +01:00
7305d2e0ef
Merge branch 'ubitwork' into avination
2012-05-21 07:32:27 +02:00
32e63fc04f
missing update script events call
2012-05-20 17:30:01 +01:00
11f582b26d
minor changes
2012-05-20 13:18:15 +01:00
2767574d0f
fix m_sitAvatarHeight to be half size.z, reduced default to a more resonable value ( 1m);
2012-05-19 18:10:44 +01:00
10889c86d9
reduce useless waste of cpu. Make character collision events be done similiar to parts. Let same thread do it all ( like in parts ) ( to change this some structs copies must be added)
2012-05-19 16:35:48 +01:00
2c498baf58
a bit faster collision sound type verification plus a few fixes/changes
2012-05-19 13:53:49 +01:00
768e495147
Merge branch 'master' into careminster
2012-05-19 13:35:21 +01:00
ebd9d2618b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/RegionCombinerModule/RegionCombinerModule.cs
2012-05-19 13:34:44 +01:00
a2c64d9795
temp work: sounds simetric acording to materials, still 'window close' test sound. Included in coment full assimetric ( since seems we have files for it now ) case with some uuids
2012-05-19 12:25:31 +01:00
d69f197a5d
Fix setting positions of attachments. The recent security fix regarding
...
prim entry messed it up.
2012-05-19 12:35:07 +02:00
0db60eea85
Improve locking of RegionCombinerModule.m_regions
2012-05-19 04:59:36 +01:00
5759313f7f
Add size of region to OAR control file. Megaregions (sw root OARs when saved) will have a size larger than 256x256
...
Not yet read. Do not rely on this information yet, it may change.
2012-05-19 04:56:47 +01:00
824a3a114b
refactor: Add RegionConnection.PosX and PosY to return position in meters rather than copy/pasting the necessary calculations in lots of places.
2012-05-19 04:22:30 +01:00
fb8705dd4d
refactor: Rename connection paramaters from "conn" and "regionConnections" so that it's easy to tell whether they refer to the root region connection or a new region connection
2012-05-19 04:01:05 +01:00
d7f90dee1c
Correct some log messages in RegionCombinerModule about the position of the root region of a megaregion relative to an added region
2012-05-19 03:56:25 +01:00
4e5ac27928
Make the megaregion total area given to the physics module accurate instead of over-inflated.
...
This was previously over-inflated because adding a region to the NE of the root region resulted in double counting of regions already added.
An accurate extent will also be necessary for other purposes.
2012-05-19 03:45:58 +01:00
3f2a727b6d
Remove recent IRegionCombinerModule.IsMegaregion(). In theory, there can be more than one megaregion in a simulator, separated by water.
...
Rename IsRootRegion() to IsRootForMegaregion()
2012-05-19 03:17:21 +01:00
26dfcf5395
Add some method doc to RegionCombinerModule. Clean up log messages.
2012-05-19 03:07:24 +01:00
33247c8d85
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-19 02:46:37 +01:00
2b60a5c5d6
Add is_megaregion flag into oar control file. Not currently read - for future use. Please do not rely on this remaining here.
...
An adaptation of part of Garmin's patch from http://opensimulator.org/mantis/view.php?id=5975 , thanks!
Flag only written if the SW corner OAR is saved - this is the only one that captures object data presently (though not land or terrain data).
This adds an IRegionCombinerModule interface and the necessary methods on RegionCombinerModule
2012-05-19 02:45:17 +01:00
9ecdef2686
modulate collision sound intensity with collision relative velocity for parts also
2012-05-19 02:04:10 +01:00
98a2c7bfee
modulate collision sounds intensity with relative collision speed
2012-05-19 01:10:39 +01:00
247a56593f
Further refinement on properties
2012-05-18 20:02:32 -04:00
deb87e7890
fix character IsPhysical
2012-05-19 01:01:46 +01:00
e338c15433
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-18 19:34:19 -04:00
895dadbdbd
Cleanup + change properties to set fields with private set : Thanks Justin for the tip.
2012-05-18 19:34:12 -04:00
a7ece8c688
add colliders relative velocity projected in collision direction to collisions report information.
2012-05-19 00:17:37 +01:00
fc5d274229
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-18 23:56:44 +01:00
896cd45939
Fix issue where a new outfit folder is not created when a new outfit is saved if there are no previous outfits
...
This was because AddFolder() was disallowing these though they are legal.
2012-05-18 23:55:18 +01:00
c05f87b50c
Provide Telehub setting to allow use of landmarks
...
Setting to allow use of landmarks to override telehub routing. Default is off.
2012-05-18 17:51:38 -04:00
0147dc6302
Fix build break. Comment out EQG deregister/register logging.
2012-05-18 03:50:23 +01:00
45af29291a
Add level 2 debug eq logging which logs event queue polls.
...
Refactor: eq message logging into common method.
2012-05-18 03:43:36 +01:00
565c73751c
Invoke log4net configurator in pCampBot.exe in order to get OpenSim sylte logging
2012-05-18 00:49:39 +01:00
6501b1b1bb
refactor: move EventQueueGet path generation into common method. Rename some local variables in line with code conventions. Add commented out EQG log lines for future use.
2012-05-18 00:38:29 +01:00
b18c8c8e78
Don't eagerly clear frame collision events when physics actors subscribe and unsubscribe from collisions, in order to avoid a race condition.
...
Since this is done directly from ScenePresence, it can lead to a race condition with the simulator loop.
There's no real point doing it anyway since the clear will be done very shortly afterwards by the simulate loop and either there are no events (for a new avatar) or events don't matter (for a departing avatar).
This matches existing behaviour in OdePrim
2012-05-17 23:59:43 +01:00
521ad080f1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-17 23:56:36 +01:00
4d34763f8c
Check agent limit against root agent count rather than both root and child agents
...
From sl docs such as http://community.secondlife.com/t5/English-Knowledge-Base/Managing-Private-Regions/ta-p/700115
agent should apply to avatars only.
This makes sense from a user perspective, and also from a code perspective since child agents with no physics or actions take up a fraction of root agent resources.
As such, the check is now only performed in Scene.QueryAccess() - cross and teleport check this before allowing an agent to translocate.
This also removes an off-by-one error that could occur in certain circumstances on teleport when a new child agent was double counted when a pre-teleport agent update was performed.
This does not affect an existing bug where limits or other QueryAccess() checks are not applied to avatars logging directly into a region.
2012-05-17 23:33:26 +01:00
0d0c472181
removed redundant colision sounds. Temporary muted sounds ( returns at top of funtions ).
2012-05-17 23:15:07 +01:00
24b35b7e93
Merge branch 'ubitwork' into avination
...
Conflicts:
OpenSim/Region/Framework/Scenes/CollisionSounds.cs
2012-05-17 22:29:44 +02:00
511fc663a2
Temprorarily disable collision sounds until we have some sound bites
2012-05-17 21:36:27 +02:00
b4cd8b491b
Merge branch 'avination' into careminster
2012-05-17 13:34:47 +01:00
34f20b7fe3
Merge branch 'master' into careminster
2012-05-17 13:28:25 +01:00
7652b3a957
udp transfer: make number packets estimation coerent with number actually sent. Use the safer lower max packet size defined in os source (600) and not OMV one (1100).
2012-05-17 13:13:31 +01:00
6af78836a5
trigger collision sounds on active agent position for better spatial effect without using the detailed collision position. (current error will be half max physical prim size). Moved some checks from sop to collisionSound code
2012-05-17 12:17:29 +01:00
2af11fea37
Merge branch 'master' of /home/opensim/lib/osgrid/opensim
2012-05-17 00:49:33 -04:00
295bb3227d
Force the default Telehub router if no matches are found in the config.
2012-05-17 00:47:19 -04:00
e4231e95a9
increase avatars collisions report to 10 per sec, Stopped sound on avatar to volumedetect collision
2012-05-17 04:41:46 +01:00
038986baff
add avatar colision sounds. Changed test sound UUID
2012-05-17 04:14:13 +01:00
c45b5a3d1c
minor: improve method doc for TestSameSimulatorSeparatedRegionsCreateAgentFails()
2012-05-17 03:27:05 +01:00
d19fb6fb0c
Add regression TestSameSimulatorSeparatedRegionsCreateAgentFails()
2012-05-17 03:12:31 +01:00
b743835f9e
default colisionVolume is 0, use it only for user specified sound
2012-05-17 01:36:42 +01:00
f0c9cb8dc0
Comment out TestSameSimulatorSeparatedRegionsQueryAccessFails() regression test logging accidentally left in
2012-05-17 01:34:04 +01:00
6b6a00a3d5
minor: Remove redundant EstateOwner != UUID.Zero check in IsAdministrator because checking EstateOwner == user
...
Due to an earlier check we already know that user != UUID.Zero so if EstateOwner == UUID.Zero, EstateOwner == user can never be true
2012-05-17 01:30:50 +01:00
bdcf2d1348
Add regression TestSameSimulatorSeparatedRegionsQueryAccessFails()
2012-05-17 01:27:59 +01:00
7cbc54d92a
default collision sounds. Incomplete, untested, needs revision
2012-05-17 01:04:30 +01:00
e444cb9da4
Remove redundant "Teleport failed:" from reason when QueryAccess fails for the destination simulator. This part of the string is already provided by the viewer.
...
Also adds more reason logging for diagnostics when teleports are refused/fail.
2012-05-17 00:33:04 +01:00
0de7219485
collision sounds: simplify send code a bit and limit sending rate to 5 per sec per part ???
2012-05-16 23:36:37 +01:00
597f99bca7
Merge branch 'master' into careminster
2012-05-16 12:40:45 +01:00
ea47b03625
Added a invalidCollisionSoundUUID so that scripts can stop all collision sounds with llCollisionSound("",...). UUID.Zero means defaults should be used. In case part has several scripts with confliting llCollisionSound result depende on exec order. Specially on reset the efect of "" depends on reset order, it should override the others. This is intermediate improve(?) since collisions sounds seem to need a deaper revision.
2012-05-16 12:27:49 +01:00
23ae24b406
Route OAR SOG loading through the common SceneObjectSerializer.FromXml2Format() rather than the functionally identical but buggy Xml2ToSOG().
...
Remove buggy Xml2ToSOG().
2012-05-16 00:10:42 +01:00
e644e34545
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-15 23:47:42 +01:00
1b5ce8c10e
Fix issue where loading OARs could sometimes result in link numbers being reordered.
...
This was because the parts in scene objects were sometimes not serialized in link order.
This is perfectly fine since the parts still have the right link numbers, but an extra fix to adjust for this
had not been done in the SerialiserModule methods that OAR loading used.
Add regression test for same.
Addresses http://opensimulator.org/mantis/view.php?id=5948 , http://opensimulator.org/mantis/view.php?id=5749
2012-05-15 23:43:59 +01:00
02f3b116c6
Allow use of regular expressions in "show object name", "show part name" and "delete object name" console commands if --regex switch is used.
...
Deleteing objects by name, creator uuid or owner uuid now requires confirmation to avoid accidental deletion.
2012-05-15 23:42:49 +01:00
81ce169dfe
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-05-15 21:24:27 +01:00
a36c487c79
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-05-15 21:19:06 +01:00
81d7844f51
use part VolumeDetectActive and not rootPart.VolumeDetectActive to be coerent with other places in case of future changes. Should be equivalent if all is well.
2012-05-15 17:01:00 +01:00
accab1e086
sop colisions don't play sounds on volume detectors
2012-05-15 16:56:43 +01:00
ca14534b91
sop: - added UpdatePhysicsSubscribedEvents() to update physics ator collision events subcription where needed. Made it consider also VolumeDtc and phantom cases. - added extra calls to it on physics ator proprieties changes. - Fixed land collisions reports. - Handle the case of physics sending a last zero colisions reports to trigger collision_end. - Made the physics collisions report rate be 20 per second. (needs review/testing)
2012-05-15 15:54:02 +01:00
9d67523235
ubitODE: if stopped having collisions do report zero colisions once, so collision_end event can be triggered. Changed reports rate to the requested rate and not full ode rate.
2012-05-15 15:45:01 +01:00
338be76e0a
ubitODE: fix not reporting land collisions on same cases.
2012-05-15 13:41:13 +01:00
65e1d7b2d7
Guard against null root part on SQLite. This really needs to be fixed so SQLite
...
loads roots before children like MySQL does.
2012-05-15 03:16:12 +01:00
069bcd45e5
Try to fix sqlite breakage
2012-05-15 02:27:21 +01:00
995cd25f30
Port the mel/dahlia fix
2012-05-15 02:36:11 +02:00
325973d36f
don't send colision events to volume detectors
2012-05-15 01:40:46 +01:00
e7819ce909
Port Avination's collision fixes to core.
2012-05-15 01:02:38 +01:00
71115c32ad
Merge branch 'avination' into careminster
2012-05-14 23:33:16 +01:00
6126b6da72
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-05-14 23:32:49 +01:00
ebdbaba615
Merge branch 'ubitwork' into avination
2012-05-15 00:17:52 +02:00
1b81ce303e
Merge branch 'avination' into ubitwork
2012-05-15 00:04:40 +01:00
0fb663272a
make llGetCameraPos and llGetCameraRot apply to avatar that granted permission and not owner
2012-05-14 23:42:45 +01:00
e9e797b681
Fix an omission
2012-05-15 00:15:44 +02:00
e3c376156c
Completely revamp collision handling. Now works as it is supposed to.
2012-05-14 22:45:54 +02:00
52a32878a9
Save the Telehub and its Spawn Points in the OAR
2012-05-14 19:59:45 +01:00
af6c85308a
minor: add explanative comment to 'missing baked texture' logging commonly seen on inter-simulator teleports where avatar baked textures are not available from the asset service.
2012-05-14 18:57:42 +01:00
deeac69312
minor: comment out individual attachment transfer log messages for now
2012-05-14 18:48:40 +01:00
c2aa3b90d9
Set the agent in transit teleport flag at the first available opportunity (i.e. when IsInTransit() was being checked) to close down a race condition.
...
On EntityTransferModule.DoTeleport() there was an IsInTransit() check to prevent multiple simultaneous teleport attempts.
However, the SetInTransit() was only performed later on, which left a window in which multiple threads could pass the IsInTransit() check.
This has been seen in the field and the results aren't pretty.
This commit effectively combines the IsInTransit() and SetInTransit() checks so there is no such window.
More failure cases are made to to call ResetInTransit() to adjust to this move.
2012-05-14 18:36:26 +01:00
42557d7d4c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-14 18:33:20 +01:00
fad557485c
Add more region information to some teleport related logging
2012-05-14 18:06:48 +01:00
e78043cb70
Check parcel entry permissions when moving objects
2012-05-14 01:32:22 +02:00
59826c15ce
Allow non-gods to deed no-mod objects
2012-05-14 01:21:10 +02:00
171480f235
Merge branch 'master' of /home/opensim/src/OpenSim
2012-05-13 17:40:03 -04:00
b80db81cdd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-13 17:39:05 -04:00
30a272ba31
Modifications for SMTP in OpenSimulator. Email size limit was fixed (was out of step with documentation at 1024, so boosted to 4096). Added configuration item for maximum email size. Redundant sleep inside email module was fixed (LSL Api was already sleeping). Added sleep time configuration item for snooze between email sending for LSL Api. Added two new configuration items (email_max_size and email_pause_time) into the example OpenSim.ini, plus fixed a spelling error (llimits) and odd tabbing.
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-05-13 17:34:20 -04:00
7c229c8b81
Add configurable SpawnPointRouting
...
Will use one of three selected methods to route avatar landing
points when using Telehubs. The setting is in [Startup] using
SpawnPointRouting = closest/random/sequence
closest: The default setting. Routes avatar to the nearest SpawnPoint
to the location.
random: Picks random SpawnPoints to land the avatar.
sequence: Follows a sequence to place the avatar on the next available
SpawnPoint location
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-05-13 17:20:54 -04:00
9870d7e4e7
ubitODE fix force in case of mlinear motor offset present
2012-05-13 01:28:20 +01:00
fe029cf4e8
Merge branch 'avination' into careminster
2012-05-13 01:25:03 +01:00
e5653ebeb7
Merge branch 'avination' into careminster
2012-05-13 01:24:10 +01:00
e2dc04586a
Merge branch 'master' into careminster
2012-05-13 01:24:01 +01:00
9b7023a159
display a sleep time of zero if forced spare time to zero, when sim fps is lower than desired, for better display coerence.
2012-05-12 17:58:36 +01:00
7461fe4554
TEST MESS* reduce animation packets send. Added onchangeanim event with parameters to define if to add or remove, and if to send anims pack on that evocation, etc
2012-05-12 15:27:37 +01:00
cf8b7c8aff
Merge branch 'avination' into ubitwork
2012-05-12 14:10:15 +01:00
4d98a291a2
ubitODE let vehicles responde faster to changes of some parameters like motors decay times
2012-05-12 14:00:08 +01:00
792e8db456
ubitODE reduced again a bit the max allowed correction velocity on colisions, to reduce a bit bouncing inerent to colisions.
2012-05-12 13:44:47 +01:00
46095c963c
ubitODE: trial workaround for avatar colisions
2012-05-12 12:17:28 +01:00
9d66792c2a
Fix mono compiler warning.
...
Last jenkins failure looked like a glitch.
2012-05-12 03:04:47 +01:00
8b958e7e74
Revert "Save the Telehub and its Spawn Points in the OAR"
...
This reverts commit b0b7b45b94
2012-05-12 02:36:56 +01:00
8dd5f08b6e
revert terminal vel reduction. It helped but not efective
2012-05-11 15:53:31 +01:00
b0b7b45b94
Save the Telehub and its Spawn Points in the OAR
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-05-10 22:56:37 -04:00
480216f50f
Print out more information on connecting bots
2012-05-11 02:38:29 +01:00
e618194143
Mantis 6015 new LSL function llGetAgentList.
...
Details in the lsl wiki
2012-05-11 02:25:52 +01:00
f231ac39de
Increase minimum period between bot actions to 3 seconds, so that teleport doesn't fall under the minimum 2 second limits that clients take to process it
2012-05-11 02:23:18 +01:00
9c392f6a68
Stagger multiple bot logins by 5 seconds to make this part of the test more 'realistic'
...
TODO: Need to make this value configurable by a command line parameter to pCampbot
2012-05-11 02:05:32 +01:00
0ddf3c5289
Do bot startup on another thread so console is responsive during this process
2012-05-11 01:56:00 +01:00
93b615c51d
Do each bot shutdown on its own threads to prevent one slow shutdown holding up all the rest.
...
This does increase the aggressiveness of shutdown
Also prevents the bot list being locked for a long period, which was preventing commands such as "show bots" from working during shutdown
2012-05-11 01:37:03 +01:00
dc39ec82fa
Change bot.IsConnected to be ConnectionState with Disconnected, Connecting, Connnected and Disconnecting states
2012-05-11 00:53:21 +01:00
ab4e6a02a5
If a bot is not connected, show region name "(none)" instead of throwing an exception in the "show bots" command of pCampbot
2012-05-11 00:37:20 +01:00
903cff9264
Add ConsoleTable framework class for future uniform formatting of console output tables.
...
Still subject to change - if you use this be prepared to change your output code if/when the methods change.
Make new "attachments show" command use this.
2012-05-10 23:47:39 +01:00
abc029d1f4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-10 23:43:38 +01:00
bce3e7cb06
Add "attachments" show console command that will show the server's record of which attachments an in-scene avatar has.
...
For debugging purposes.
2012-05-10 22:48:03 +01:00
3c37bc2851
reduce avatars terminal velocity to less than 30m/s or colisions with basic boxs fail badly. (ode lib problem. chode just may support a bit higher velocity due to the use of tilt).
2012-05-10 22:44:12 +01:00
117c183fde
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-10 14:43:02 -07:00
f374b63ac8
Add even for terrain tainting and synchronize terrain module with physics scene before physics simulation step rather than after
2012-05-10 14:42:46 -07:00
8558a36506
Merge branch 'master' into careminster
2012-05-10 20:33:27 +01:00
de44734fe9
Saving estate state is really slow (relatively) and it gets
...
completely rewritten every time a region starts up. This
makes the data write only when the data was not already
read from the database.
There is a still a major race condition whenever two regions
share the same estate data, but at least it won't be triggered
on startup.
2012-05-10 09:08:40 -07:00
d0c0d37d24
ubitode: changes to vehicles servos
2012-05-10 16:17:02 +01:00
a90822f4b8
Merge branch 'master' into careminster
2012-05-10 00:42:10 +01:00
d8a78374aa
Where necessary, rename OpenSim/Services/Connectors/*.cs files to reflect the actual class names.
...
This is usually because the file name was singular (*Service*) but the class name was plural (*Services*).
This is to make configuration easier rather than having to look in the c# code itself to find the slightly different name of the connector.
This does not affect existing configuration since the files are being renamed rather than the classes.
2012-05-09 23:25:01 +01:00
6987aef38d
Improve logging on the prim inventory script asset request path for future use.
...
This adds name and description of the request handler to http request logging when DebugLevel >= 1
2012-05-09 23:12:30 +01:00
e813f41478
Escape and unescape xml element names if necessary in ServerUtils.BuildXmlData() and ParseElement()
...
If AvatarService appearance data is retrieved over the network, then ServerUtils was attempting to transfer names such as "Wearable 0:0" directly to xml element names, resulting in an exception.
Space is not valid in xml element names. Neither is : in this case since the intention is not to namespace. Using names directly as keys is not a good idea.
To get around this problem this patch escapes and unescapes the element names as appropriate.
This has no impact on existing xml (since it had to be valid in the first place) but allows AvatarService data to be used over the network.
Setting appearance (from simulator to AvatarService) did not suffer this problem since the values are passed in the query string which is already properly escaped.
2012-05-09 21:11:14 +01:00
50321fb7bf
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-05-09 00:43:33 +01:00
61e99bcdcb
Mantis 6015 new LSL function llGetAgentList.
...
Details in the lsl wiki
2012-05-09 00:14:24 +01:00
e5dbb652d5
Remove physics actor related race conditions in SetVehicleFlags() and SetPhysicsAxisRotation()
...
sop.PhysActor can currently become null at any time.
2012-05-09 00:11:10 +01:00
3bc5620d74
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-08 16:06:02 -07:00
20952c75c5
Trigger event when scene presences are updated
2012-05-08 16:05:34 -07:00
c21c9e13ef
Mantis 1456 same region teleport of a sitting avatar.
...
Region to region was fixed some time ago in EntityTransferModule.
This applies the same fix for same region teleports.
2012-05-09 00:02:13 +01:00
ef279c5a62
Add automated TestllBreakLink()
2012-05-08 23:36:23 +01:00
c0658a102e
Add automated TestllCreateLink()
2012-05-08 23:29:51 +01:00
6406d5a5b9
refactor: Eliminate local id parameter from api initialize.
...
This is always available from m_host.LocalId
2012-05-08 23:20:27 +01:00
01b78235db
Instead of constantly looking up unchanging self item in script code, pass in self item on initialization.
2012-05-08 23:05:01 +01:00
abbd050a13
Perform SceneGraph.DuplicateObject() under existing m_updateLock already used for link and delinking, in order to avoid race conditions.
...
DuplicateObject() relies on source object having correct link numbers for the duration of the dupe.
Both link and delink can change link numbers such that they are not consistent for short periods of time.
2012-05-08 21:31:35 +01:00
05634907e9
Merge branch 'master' into careminster
2012-05-08 00:07:18 +01:00
900afbd53e
Merge branch 'avination' into careminster
2012-05-08 00:07:13 +01:00
d3844d142d
Merge branch 'ubitwork' into avination
2012-05-07 23:03:57 +02:00
74eafb78eb
Fix moving no-mod objects. Fixes a regression introduced with the undo fix
2012-05-07 23:03:07 +02:00
75c51f33c4
minor change to linear motor decay
2012-05-07 21:44:24 +01:00
5d1d47e1f9
Revert "Better error handling if Load OAR or Save OAR fail"
...
This reverts commit 65c88b2ff4
2012-05-07 20:01:17 +01:00
15844da3af
Log the full exception when errors occur in BaseHttpServer
2012-05-07 19:56:00 +01:00
65c88b2ff4
Better error handling if Load OAR or Save OAR fail
2012-05-07 19:07:38 +01:00
a82dc263ab
For osGetGridNick(), osGetGridName(), osGetGridLoginURI() and osGetGridCustom(), try to read from the [GridInfoService] section on standalone rather than [GridInfo]
...
[GridInfoService] is the section that's actually in bin/config-include/StandaloneCommon.ini.example
2012-05-07 19:05:21 +01:00
5053506d88
refactor: Instead of performing a ScenePresence lookup twice over LocateClientObject() and GetClientScene(), do the lookup just once in LocateClientObject()
2012-05-07 18:27:33 +01:00
cdf97ab3a6
Fix a bug in FriendsModule.StatusNotify() where all subsequent friends would not be notified once a non-local friend was found.
2012-05-07 17:21:45 +01:00
df7abbb367
Merge branch 'master' into careminster
2012-05-07 12:07:47 +01:00
1120a2cf36
Merge branch 'avination' into careminster
2012-05-07 12:07:42 +01:00
4032455332
add a null check for Primitive.Sculpt in PrimitiveBaseShape constructor for OpenMetaverse.Primitive object
2012-05-07 00:33:50 -07:00
4186fa10f0
remove default values from prior commit since mono cant deal with them
2012-05-07 00:08:56 -07:00
b697d0e895
add OS_NPC_RUNNING option to osNpcMoveToTarget() to allow running speed for moving NPCs
2012-05-06 23:54:50 -07:00
b60f51dafc
Stop llSetPos from sending one update per child prim
2012-05-06 19:21:54 +01:00
2ab9588c9a
UbitODE: reduced the diference btw dinamic and static friction, making dinamic larger more identical to static.
2012-05-05 11:03:38 +01:00
e3226aecd9
SOG: tell physics about when we want a force or a impulse. (sorry add to change here also)
2012-05-05 10:47:51 +01:00
3b78e33d16
ubitODE prims: - moved outbounds checking back to UpdatePositionAndVelocity() from move() so it's done at end of each ode step and when it reports positions to core. There should be no need to check in both places. - Addforce() and AddAngularForce now apply a force if parameter pushforce is true or apply a impulse if false as it's actually needed (the prims grab case should be a force)
2012-05-05 10:40:03 +01:00
b62cc3ce0a
Merge branch 'avination' into careminster
2012-05-05 10:32:22 +01:00
31ab8b2fe0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-05-05 10:32:04 +01:00
163a86517a
force lower avatar density for testing
2012-05-05 03:28:35 +01:00
01b00ad0d5
Fire the scripting changed event with CHANGED_OWNER when an object that has changed owners is rezzed.
...
This needs to occur after the script is resumed rather than before, when the event is just dropped.
Addresses http://opensimulator.org/mantis/view.php?id=5890 and http://opensimulator.org/mantis/view.php?id=5952
2012-05-05 00:29:14 +01:00
e18686528e
Use the more efficient HashSet instead of List for FlotasmAssetCache.m_CurrentlyWriting
2012-05-04 23:03:33 +01:00
dec6ad2933
Don't try and update the access time of a file that is actively being cached.
...
This may cause IOErrors on Windows.
Aims to help with http://opensimulator.org/mantis/view.php?id=6003
2012-05-04 22:57:33 +01:00
6b3135aa4d
UbitODE: leave avatar 'freemove' state (entered on setmomentum) on any significant change like new 'velocity' or new position, etc, requests
2012-05-04 22:24:04 +01:00
da4819a170
Temporarily add debug log lines to lsl url request and release
...
To help with http://opensimulator.org/mantis/view.php?id=5993
2012-05-04 22:11:25 +01:00
c84ef57e52
minor: remove mono compiler warning
2012-05-04 21:04:42 +01:00
92fde6ed26
Mantis 60004 problems with damage and llSetDamage. In damage enabled areas this patch - Deletes any objects that have damage set > 0 that deliver that damage to an avatar Stops Gods receiving damage, Stops volume detect objects causing damage Deletes NPCS when their helth reduces to zero Gradually "heals" damage to an avatar Resets health on going to a non damage area
2012-05-04 21:01:09 +01:00
6096a1f30e
Change LongCallTime on WebUtil to 3000, to match the time where request handling is considered "slow".
...
This may be the wrong thing to do but stops lots of log spam in HG setups now that the monitoring is extended to other outgoing calls.
LongCallTime may need to be made configurable.
2012-05-04 20:53:30 +01:00
e83bc049df
refactor: Rename new DeleteFoldersEx/PurgeFoldersEx methods to DeleteFolders/PurgeFolders overloads as previously discussed with Oren - I think this makes more sense on balance
...
These overloads are not publicly available on core connectors or IInventoryService.
2012-05-04 20:37:21 +01:00
ad23774433
Allow deleting folders even if they're not in the Trash
...
The functions DeleteFolders() and PurgeFolder() still work as before, i.e. they only allow deleting folders that are in the Trash. However, the functions DeleteFoldersEx() and PurgeFolderEx() can now be used to delete any folder.
2012-05-04 20:30:46 +01:00
197163e12a
Fix teleporting from older to newer regions
2012-05-04 21:00:41 +02:00
333d013b5c
Add the default animation to the child agent data update
2012-05-04 20:33:48 +02:00
cccef2e56d
Calculate the Daylight Savings Time information sent to the viewer based on US Pacific Standard Time rather than whatever timezone the login server is set to.
...
This is because the viewer doesn't receive a timezone from the server but bases its displays on Pacific Standard Time.
However, it still expects to receive notification from the server as to whether or not Daylight Savings Time for PST is in operation.
This commit introduces a new DSTZone setting in the [LoginService] config setting that accepts a list of timezone names valid across different platforms to calculate Pacific DST.
If you need the old behaviour of calculating DST based on the local timezone of the server running the login service, then please override DSTZone with "local".
A mailing list announcement will be made later.
Thanks to Olivier Van Helden and Gudule Lapointe for determining this behaviour and providing this patch.
From http://opensimulator.org/mantis/view.php?id=5972
2012-05-04 19:21:43 +01:00
b5b21013da
Reverse the order of physics event unsubscription to allow GC. Adapted from Unit's reverted patch
2012-05-04 20:06:42 +02:00
1183310a05
Retain velocity on walking crossing - adapted from Ubit's reverted patch
2012-05-04 20:05:51 +02:00
88c4c7283f
Revert "*TO TEST/REVIEW* added current default animation in animationSet.cs to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);"
...
This reverts commit 12c9916193
2012-05-04 20:02:14 +02:00
12c9916193
*TO TEST/REVIEW* added current default animation in animationSet.cs to/fromArray in array element 0. This may cause compatibilities issues, but think this information is needed for proper crossings. OSG regions did survived tps in/out with this. ALso added velocity in crossings cases, for now detected by Teleport flag equal to Default (0);
2012-05-04 19:19:54 +01:00
58a1a0710c
SOG copy bug fix, now new group has own empty list of sitted avatars. Also changed crossing code to restore sitting avas in case of group cross fail
2012-05-04 11:32:37 +01:00
fb99ee6774
minor: Tweak BaseHttpServer message to make it clear that this relates to slow handling of inbound requests.
2012-05-04 01:16:56 +01:00
c9faf0df74
Extend 'slow' request logging to other server outbound requests (forms, rest, async rest) as well as the existing logging on outbound OSD requests.
...
Also prints out the first 100 chars of any slow request data since this can contain useful info (such as agent ID).
2012-05-04 01:12:56 +01:00
c221eaf0b0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-05-03 22:39:04 +01:00
fcd5b0817b
Reinsert a 2000ms delay before closing a no longer required agent on the source region after teleport to resolve Imprudence teleport problems.
...
Viewers 1 and 3 are fine with doing this immediately. However, Imprudence has a small delay (<200ms, >500ms) after receiving the AgentCompleteMovement reply packet on the destination region before regarding that region as the currnet region.
If Imprudence receives a DisableSimulator in this period, it quits.
We are not restoring the full 5000ms delay since this brings back a bug where teleports permanently fail if an avatar tries to teleport back too quickly.
This commit also sends the AgentCompleteMovement packet to the client before telling the source region to release its old agent, in order to further cut down any possibility of the DisableSimulator being recieved before the AgentMovementComplete.
2012-05-03 22:30:36 +01:00
100e4ca67e
Fixes Mantis #5999 . llSetLinkPrimitiveParams with PRIM_BUMP_SHINY did cause a runtime error.
2012-05-03 19:00:09 +02:00
bf5f8b54ae
Remove the somewhat misleading logging of the string length of some unknown requests, as this appeared to be some kind of numbered error code.
...
This brings these messages into line with similar messages that did not do this.
2012-05-03 02:22:06 +01:00
9ffc2c1062
minor: resolve some mono compiler warnings
2012-05-03 01:56:24 +01:00
231a3bf147
Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.
...
This is most useful for capabilities where the url is not self-describing.
2012-05-03 01:45:49 +01:00
2af7f50f26
Stabilize sit position on region crossing
2012-05-03 02:07:55 +02:00
9f9693dab8
Clear permissions given to the object we stand up from
2012-05-03 01:18:51 +02:00
8b1cc0dd29
Merge branch 'avination'
2012-05-03 00:15:45 +02:00
a135e51d23
Improved sitted avatars crossings ( plus tests on vehicles)
2012-05-02 22:08:09 +01:00
bf630fb808
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
2012-05-02 01:37:51 +01:00
40f3c24562
Comment out the five second sleep in etm.DoTeleport() if the old agent needs to be closed because it is no longer in the child's view distance.
...
This sleep appears unnecessary since a sleep has already occurred in WaitForCallback() whilst waiting for the destination region to notify of teleport success.
There are no async operations between this sleep and the WaitForCallback()
If this sleep is present, then teleporting back to the source region within 5 seconds results in a disconnection.
If this sleep is commented out then teleporting quickly back and forth between two simulators appears to work without issue.
Tested on standalone, local grid and distributed grid.
Please revert if there's something that I've missed.
2012-05-01 23:49:02 +01:00
58d460542d
Merge branch 'avination'
2012-05-02 00:33:56 +02:00
82197c87a2
Merge branch 'ubitwork' into avination
2012-05-02 00:33:37 +02:00
e6e12c2d42
Merge branch 'avination'
2012-05-02 00:32:28 +02:00
98e9f22544
Preserve attachment rotation on objects rezzed via a script. Makes toasters
...
work right, finally.
2012-05-02 00:29:56 +02:00
a29f7f7551
Remove some test code that accidentally crept in with 9d2e1c67
2012-05-01 23:25:30 +01:00
9d2e1c67a8
Add regression test for teleporting between neighbouring regions on the same simulator
...
This adds a non-advertised wait_for_callback option in [EntityTransfer]. Default is always true.
Teleport tests disable the wait for callback from the destination region in order to run within a single thread.
2012-05-01 23:14:12 +01:00
fc3cf2b5a3
Fix saving of attachment positions
2012-05-01 23:21:28 +02:00
5786521103
Move max teleport distance check down into etm.DoTeleport() since this should apply to all teleport calls, not just those through Teleport()
2012-05-01 18:38:46 +01:00
37dd174697
refactor: Split most of EntityTransferModule.Teleport() into its same region and different region teleport components.
...
DoTeleport() now retrives IEventQueue itself rather than requiring it to be passed in.
2012-05-01 17:52:30 +01:00
4b982db252
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLAssetData.cs
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/MySQLUserAccountData.cs
2012-04-30 19:04:38 +01:00
b678ea18b2
Create TestHelpers.EnableLogging() and DisableLogging() to turn logging on and off within tests.
...
This makes *.Tests.dll.config files no longer needed, hence deleted.
2012-04-30 18:44:22 +01:00
9c2a73b61e
llGenerateKey implementation. Creates a random UUID I.E: UUID.Random().ToString();
...
Signed-off-by: TBG Renfold <tbg.renfold@g2mv.co.uk>
2012-04-30 17:36:49 +01:00
d0598c63f3
refactor: Simplify by combining SafeSendControlsToScripts() from fe8e835 into SendControlsToScripts() (instead of SendControlToScripts()).
2012-04-30 17:33:08 +01:00
fe8e835bfc
Fixed: scripted controls didn't work if the avatar was sitting down
...
This fixes a bug introduced in 6473674bbf
2012-04-30 17:18:15 +01:00
4ad45934c6
If there are no new prim items to store then don't bother opening the MySqlConnection only to do nothing with it.
2012-04-30 16:00:31 +01:00
522eff6138
Consistently use using() to make sure we dispose of used MySqlCommands where this is not already being done.
2012-04-30 15:54:35 +01:00
303739622c
ubitODE fix applyROtationImpulse, let vehicle hover be relative to root prim and not center of mass ( as SL docs said) updated some flags to current ones
2012-04-29 11:46:16 +01:00
be176b1e49
ubitode fix inertia for same cases. Added a nasty lock on llGetCenterOfMass and simulate
2012-04-29 08:24:41 +01:00
84b5b3e89b
llGetGeometricCenter...
2012-04-29 06:39:09 +01:00
ad12b5df49
Merge branch 'master' into careminster
2012-04-29 02:23:54 +01:00
c7c0d5558b
remove repeated set of group rotation to physics
2012-04-29 01:00:46 +01:00
df9935273f
SOG bug fix in group rotations updates
2012-04-29 00:41:51 +01:00
174fa4a70f
Merge branch 'avination'
2012-04-29 01:33:40 +02:00
dd745f60c2
fix llGetCenterOfMass ( checked with ubitODE only)
2012-04-28 21:36:38 +01:00
8380166251
Comment out debug [ASYNC DELETER] messages for now.
2012-04-28 00:39:40 +01:00
cd755fe598
Remove mono compiler warning. Adjust message log to error from info
2012-04-28 00:31:11 +01:00
133f05dc41
Add text about using double quotes to surround console command arguments containing spaces to "help" text.
...
e.g. show object name "My long object name"
2012-04-28 00:29:08 +01:00
2bad430ed8
Put scene object related console commands into new "Objects" help category rather than "Regions"
2012-04-28 00:08:04 +01:00
ab71779221
Revert "Revert "Implement bulk inventory update over CAPS (not recursive by design,""
...
This reverts commit a90b0e302c
2012-04-27 23:54:45 +01:00
737e177163
Revert "Log the full exception when errors occur in BaseHttpServer"
...
This reverts commit e31e7c68c8
2012-04-27 23:46:46 +01:00
a90b0e302c
Revert "Implement bulk inventory update over CAPS (not recursive by design,"
...
This reverts commit 6e7f13a72d
2012-04-27 23:46:33 +01:00
d25469f66e
Add flags information (phantom, physics, etc.) to "show object" and "show part" console commands
2012-04-27 23:38:25 +01:00
e48fa38ff5
Oooops don't hover underground but do hover
2012-04-27 23:18:54 +01:00
f5cb403e7e
reorder priority of vehicle hover flags
2012-04-27 22:59:57 +01:00
dcbcbd697f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
2012-04-27 22:28:09 +01:00
e31e7c68c8
Log the full exception when errors occur in BaseHttpServer
2012-04-27 21:52:04 +01:00
6473674bbf
Fixed: custom walking animations didn't stop when the avatar stopped walking.
...
This happened because the scripts were notified about control changes (e.g., the user stopped pressing the Forward key) when the animation was still WALK, so the script didn't stop the walking animation. Fixing this required: a) Update the movement animation *before* notifying the script; b) Add locking to prevent clashes with the Heartbeat thread (which also updates the animations); c) Handle the case of a user who stops walking just as the avatar is in the air: the avatar should STAND in that case, not WALK.
This reverts commit feef1dd732
2012-04-27 20:47:02 +01:00
9622e8ac72
If a Grid God teleports then include the Godlike teleport flag. This can affect the starting position in the destination region.
2012-04-27 20:22:35 +01:00
37d770f814
Use DotNetZip to compress OARs and IARs.
...
DotNetZip provides much better compression than standard .NET.
2012-04-27 19:46:31 +01:00
e39e4f6bfb
minor: style adjustments in SensorRepeat, mainly related to patch from stoehr
2012-04-27 19:40:19 +01:00
b35a1d5681
Fixing wrong position of llSensor, SensePoint wasnt following the rotation of the root prim.
2012-04-27 19:31:50 +01:00
9bc94c502a
MapImageService: changed the event at which the map tiles are uploaded, because they were being uploaded before the region was registered with the grid
2012-04-27 11:05:40 -07:00
a9dbe39319
MapImage security issue. Compare strings instead of IPAddresses.
2012-04-27 10:39:20 -07:00
292752bb78
MapImage security issue: better error messages
2012-04-27 10:22:43 -07:00
ac64fe03d8
Amend to last commit: account for the existence of proxies.
2012-04-27 09:59:46 -07:00
2970a18e54
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-27 09:26:14 -07:00
c84f63f4dc
Minor change in error message (HG teleport failures)
2012-04-27 09:24:50 -07:00
e4e754ee93
MapImageService: added an additional security check for OSGrid and other grids like it.
2012-04-27 09:23:56 -07:00
90305001de
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-04-27 17:09:49 +01:00
ee237fc5df
test
2012-04-27 12:19:22 +01:00
8ef7df5a56
test
2012-04-27 11:01:34 +01:00
2006188ee5
test
2012-04-27 10:49:32 +01:00
2419de2b6d
test
2012-04-27 10:10:31 +01:00
fedc9eb105
itest
2012-04-27 09:50:53 +01:00
1c735facee
test
2012-04-27 09:23:20 +01:00
cadbfcc011
itest
2012-04-27 09:15:31 +01:00
b948826b7e
test
2012-04-27 09:09:29 +01:00
7a7f4b7722
testing
2012-04-27 09:00:30 +01:00
03450dee39
testing....
2012-04-27 08:11:18 +01:00
6edbbdc83a
ubitODE fix don't report colisions with a volume detector ( only report to it )
2012-04-27 06:00:50 +01:00
e974d493c6
testing
2012-04-27 03:44:15 +01:00
d8f691664a
testing
2012-04-27 03:36:49 +01:00
76d9040ed4
testing
2012-04-27 02:54:39 +01:00
911bc81b00
testing
2012-04-27 02:13:54 +01:00
a64a9e48de
TESTING
2012-04-27 01:43:27 +01:00
7397c9a68e
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-27 01:31:12 +01:00
30ab9647ba
TEST more changes
2012-04-27 01:24:44 +01:00
61e99fba87
TEST more options to avnLocalTeleport
2012-04-27 01:18:30 +01:00
2cf6023892
TEST added avnLocalTeleport(Vector3 newpos, Quaternion? newrot, bool Stopped) to scenepresence.cs
2012-04-27 01:06:07 +01:00
07e62df558
Add regression test for teleporting an agent between separated regions on the same simulator.
...
This involves a large amount of change in test scene setup code to allow test scenes to share shared modules
SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static
May split these out into separate classes in the future.
2012-04-27 00:58:54 +01:00
8a65f5a70d
OSSL: Removed check for CanRunConsoleCommand() in osKickAvatar.
...
OSSL permissions are now controlled in OpenSim.ini.
2012-04-26 22:53:13 +01:00
0da8fe3124
Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type.
2012-04-26 22:49:14 +01:00
ee13d817f1
When creating an OAR, objects where the user is the Creator are always included, regardless of their permissions.
...
The purpose of the permission checks is to prevent the unauthorized copying of assets, but users can always copy assets that they created.
2012-04-26 22:41:31 +01:00
cb6791fb30
Tweak log messages on local region to region teleport path to help with problem resolution.
2012-04-26 22:35:25 +01:00
d19aa9e792
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-26 21:54:50 +01:00
2542ca2a49
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-26 16:40:36 -04:00
fba802bb03
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-26 16:13:47 -04:00
b8114d2b67
Add a version of osNpcSay that takes a channel number Mantis 5747
...
osNpcSay(UUID npc, string message) left untouched
New functions:-
osNpcSay(UUID npc, int channel, string message)
osNpcShout(UUID npc, int channel, string message)
osNpcWhisper(UUID npc, int channel, string message)
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-04-26 16:13:29 -04:00
fc576df273
revert last add commit
2012-04-26 18:24:36 +01:00
f194c48cd3
add wearable type PHYSICS
2012-04-26 17:42:11 +01:00
ca228c4770
Comment out old Scene.HandleLogOffUserFromGrid() to reduce client closing analysis complexity
2012-04-26 16:20:53 +01:00
fd19601c6b
Help big boobies to dance (avatar visualParams). May not persist and need more lobe ?
2012-04-26 16:17:46 +01:00
f49912f92a
minor: Add more detail to unauthorized caps client message
2012-04-26 16:10:24 +01:00
b0cbf16c19
minor: Add region name to dropped inbound packet message
2012-04-26 16:04:49 +01:00
4c4ffb9868
Add request verb and url to error messages in WebUtil that lack this.
...
Make exception printing consistent across windows and mono.
2012-04-26 00:43:31 +01:00
e52fe03fff
minor: Add avatar name to removing agent log message
2012-04-26 00:42:37 +01:00
74dbfe6bb5
Comment out avatar move to target message for now.
2012-04-25 23:46:42 +01:00
133370f158
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-25 11:57:29 -07:00
a2d544c938
Add a configuration switch to turn on/off the use of the trash
...
folder when deleting objects from a scene. The use of the trash
folder causes assets to be created and stored everytime you delete
an object from the scene (slows down the delete and adds mostly useless
assets to your database).
Default is on (use the trash folder) which is the standard behavior.
2012-04-25 11:54:57 -07:00
db31c9fe58
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-25 19:15:40 +01:00
88553bb884
Port Avination link order to make OpenSim behave like SL. Make Primstar scripts work. Fixes Mantis #5990
2012-04-25 19:09:22 +01:00
b62eee2f0b
Merge branch 'master' into careminster
2012-04-25 18:55:51 +01:00
88c9fdfa3a
Adapt some TeleportWithMomentum calls
2012-04-25 18:36:29 +01:00
1afae01311
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-25 09:52:44 -07:00
bec100a662
Add try/catch around Json script method registration to avoild some issues
...
with .NET 3.5 vs 4.0 differences.
See http://opensimulator.org/mantis/view.php?id=5971
2012-04-25 09:51:30 -07:00
22ea2ef9a0
set PIDHoverTau and not PIDTau since all physics need that
2012-04-25 17:11:32 +01:00
916e372382
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-04-25 16:49:07 +01:00
7aa25c6762
Slight rewording of output messages.
2012-04-24 22:40:07 -07:00
fd281ded3f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-24 22:17:52 -07:00
cf1c34605b
HG: Moved User-level code down to the HGEntityTransferModule where it belongs.
2012-04-24 22:17:10 -07:00
550ff3b4da
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-04-25 04:01:55 +01:00
3be3189ee0
Commit the avination Teleport() methods (adaptedto justincc's changes)
2012-04-25 04:00:01 +01:00
af86e2939c
zero out SP velocity before calling SP.Teleport(), as the client expects (though this is also effectively done by physics at the moment)
2012-04-25 03:47:26 +01:00
9a23501824
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-04-25 02:33:39 +01:00
683cfc6f82
refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()
...
These are identical apart from setting Velocity = zero, which has no practical effect anyway since this is zeroed when the avatar is added back to the physics scene.
2012-04-25 02:07:55 +01:00
a65ca24701
Add regression test TestSameRegionTeleport()
2012-04-25 01:51:40 +01:00
def65cd94a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-04-25 01:22:09 +01:00
f24289c47f
Comment out AvatarService.SetAvatar debug log line for now
2012-04-25 01:09:23 +01:00
6b299a4287
Comment out some debug ATTACHMENTS log messages for now.
2012-04-25 00:52:33 +01:00
39a6d7cab4
Comment out the noisier AVFACTORY log messages for now.
...
Permanently comment out warnings about ScenePresence not being found - this is entirely expected if the avatar has alraedy logged out or left the scene.
2012-04-25 00:47:32 +01:00
0f470326aa
Improve teleport log debug and error messages to tell us who is teleporting.
2012-04-25 00:19:38 +01:00
3da613adf5
fix chODE loosing some part positions when doing isPhysical false
2012-04-24 23:13:57 +01:00
54d5ff6774
Go back to always using the local timezone for now - not all machines have US/Pacific or Olsen Amercia/Los_Angeles and this introduces variability that the server operator cannot control
...
Please see http://opensimulator.org/mantis/view.php?id=5972 soon for more comments.
2012-04-24 23:00:50 +01:00
816a44d6da
SOG bug fix in UI object changes
2012-04-24 21:48:12 +01:00
ef1668adb3
Revert "Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type."
...
This reverts commit d3a4d67a20
2012-04-24 21:42:32 +01:00
2f398231ac
Minor improvements to logging
...
Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]").
2012-04-24 21:38:09 +01:00
c5520dc83f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-24 21:30:12 +01:00
d3a4d67a20
Refactored how asset/inventory types are associated with content types: gathered all the knowledge into a single class. Added the Mesh content type.
2012-04-24 20:52:18 +01:00
da5fd53702
Fixed problem with MySQL: it was possible for one thread to use an incomplete list of column names if another thread was creating the list at the same time. Now this is thread-safe.
2012-04-24 20:49:28 +01:00
c70e85a327
When reading a region, use null objects to represent NULL fields.
...
Previously NULL fields were converted to an empty string due to the use of ToString(). But if the field was an Int (e.g., "locZ"), then the subsequent attempt to convert an empty string to an int caused an exception. Now the field is null so we don't try to convert it, so there's no exception.
2012-04-24 20:46:31 +01:00
6011bfa5e3
OSSL: fixed the threat level check for osParseJSONNew
2012-04-24 20:41:29 +01:00
cbe889e10b
minor: formatting changes to top of LLLoginResponse.SetDefaultValues(), chiefly some break up of the long line.
2012-04-24 20:30:19 +01:00
0e3053e4c9
DST settings to match client default Pacific Time (mantis #5972 )
2012-04-24 20:22:34 +01:00
c6f30e044b
Restore _parent_scene.actor_name_map[prim_geom] = this; accidentally removed from ODEPrim.SetGeom.
...
This occurred in 7a574be3fdhttp://opensimulator.org/mantis/view.php?id=5988
2012-04-24 20:15:10 +01:00
f0ba6c84e4
fix animations if sited in ground also
2012-04-24 07:27:14 +01:00
a4b76a42cc
let objects/avas push avas
2012-04-24 06:56:34 +01:00
1848ceac95
"save the catgirls"
2012-04-24 05:42:47 +01:00
fd27988978
Changed the Map-related messages from Info to Debug. They're debug messages.
2012-04-23 21:29:18 -07:00
1cfee4e84c
display heatbeat sleep time in stats. This may not be good for general use, but for testing/debug
2012-04-24 04:57:59 +01:00
95bb2049a0
fix Simulation time report
2012-04-24 04:01:29 +01:00
f1d6b3e710
some reduction on time resolution efects on spare time report
2012-04-24 03:38:13 +01:00
b019b20eb8
*testing* changed stats time reports to be per reported frame and not acumulated in about 1second. Total Frame Time is not just 1/reported sim fps
2012-04-24 03:05:29 +01:00
6c21e15cb9
Add online/offline indicator to "friends show" region console command.
...
Improve output table formatting.
2012-04-24 00:32:01 +01:00
40e37d8b78
Add osForceAttachToAvatar() and osForceDetachFromAvatar()
...
These behave identically to llAttachToAvatar() and llDetachFromAvatar() except that they do not enforce the PERMISSION_ATTACH check
Intended for use in completely controlled dedicated environments where these checks are more a UI hinderance than a help.
Threat level high.
2012-04-24 00:03:57 +01:00
b798b32b19
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-23 22:54:11 +01:00
1f8d1bcdcf
Replace common code to fetch self inventory item (as opposed to uuid) with GetSelfInventoryItem()
...
However, at some point it would be far more convenient to receive the TaskInventoryItem in the constructor rather than just the item UUID, so we don't have to constantly refetch our self item.
2012-04-23 22:52:46 +01:00
60065f06b3
refactor: Replace calls to InventorySelf() with existing m_itemID in LSL_Api
...
There's no point look up an item ID that we already have.
2012-04-23 22:23:47 +01:00
159b3b27ca
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-23 21:13:08 +01:00
e903709847
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-04-23 20:44:41 +01:00
5a8fdc8a0b
ubitODE - do own timing control (as chODE does) until heartbeat does it right
2012-04-23 20:16:53 +01:00
679da63da6
Mantis 5977 Corrections to llRegionSayTo
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-04-23 07:16:33 -04:00
e0f81e2400
ubitODE - several changes...
2012-04-23 01:47:11 +01:00
49ed68e98c
refactor: simply some properties code in BasicPhysicsPlugin
2012-04-22 20:28:12 +01:00
58c890df5d
Make TestSetPhysicsSinglePrim() actually add the object to the scene in order to test more code paths.
2012-04-22 20:03:34 +01:00
8205fe79ce
Fix bug where setting phantom on a prim would result in a server log message rather than setting phantom.
...
This was an oversight when removing some race conditions from PhysicsActor setting recently.
Regression tests extended to probe this code path.
Extending regression tests required implementation of a BasicPhysicsPrim (there was none before). However, BasicPhysics plugin is still of no current practical use other than to fill in as a component for other parts of regression testing.
2012-04-22 19:51:51 +01:00
8df4bd14f5
Merge branch 'master' into careminster
2012-04-22 15:06:06 +01:00
26fd1e3a0c
fix a bug i added fixing another....
2012-04-22 03:08:47 +01:00
190e7a4334
ubitODE: - don't try to hover underground unless volumedetector (that doesn't colide with it)
2012-04-21 05:16:54 +01:00
ae2b8f7007
Comment out spurious Body != IntPtr.Zero code after disableBody(), since disableBody() sets Body == IntPtr.Zero on all code paths.
2012-04-21 03:42:54 +01:00
f609594595
refactor: Simplify ODEPrim.AddChildPrim() by returning early where appropriate.
2012-04-21 03:23:51 +01:00
77a7de87e1
Add test for setting physics in a linkset
2012-04-21 02:45:16 +01:00
d5c724e5b8
Add regression test for prim status when root prim in a new linkset is non-physical
2012-04-21 01:51:57 +01:00
9ac48b2aff
Fix a bug where linking a non-physical prim with a physical prim as root would make the non-physical prim phantom rather than part of the physics object.
...
On region restart, the whole object would become physical as expected.
Observed behaviour from elsewhere is that all prims in a new linkset should take on the status of the root prim.
Add regression test for this behaviour.
2012-04-21 01:43:09 +01:00
17bf2a62db
Add test for correct physics status on linking two physics objects
...
Also fixes last build break.
2012-04-21 01:09:42 +01:00
71900968b2
refactor: extract common setup code in SceneObjectStatusTests
2012-04-21 01:01:24 +01:00
ae789f6c16
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-21 00:55:27 +01:00
06552f217e
Add TestSetPhysics() to SOP status tests
2012-04-21 00:54:48 +01:00
7a574be3fd
Remove redundant prim_geom != IntPtr.Zero checks in ODEPrim.
...
prim_geom == IntPtr.Zero only before a new add prim taint is processed (which is the first taint) or in operations such as scale change which are done in taint or under lock.
Therefore, we can remove these checks which were not consistently applied anyway.
If there is a genuine problem, better to see it quickly in a NullReferenceException than hide the bug.
2012-04-21 00:12:07 +01:00
c8307cdf1e
Improve bitmap disposal to do null checks and not to potentially try disposal of uninitialized variables.
...
This issue doesn't cause the mono 2.10.5 compiler to fail but appears to cause the windows compiler to fail.
Resolves http://opensimulator.org/mantis/view.php?id=5973
2012-04-20 23:35:11 +01:00
566327a948
If a physical prim is manually moved (e.g. by a user) then set the geometry position as well as the body position
...
This is necessary to stop the moved prim snapping back to the original position on deselection if moved only once
This resolves http://opensimulator.org/mantis/view.php?id=5966
2012-04-20 23:24:24 +01:00
31c5a7241e
Merge branch 'master' into careminster
2012-04-20 23:17:29 +01:00
3b56c44453
changed seletion code. SOP now knows about parts selection. UI actions are sent to SOP and this reports to SOG. Group is selected if any part is selected.sop.isSelect get() is only used in SOG. Will need to be improved for better performance on largelinksets. *UNTESTED* NEEDS CHECKING for side efects
2012-04-20 18:51:32 +01:00
464fb2533f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
OpenSim/Services/Connectors/Hypergrid/GatekeeperServiceConnector.cs
2012-04-20 16:48:43 +01:00
2c7f035925
ubitODE: - Change triangles used in terrain height estimation
2012-04-20 04:49:23 +01:00
75f117484b
Always dispose of existing opened bitmap from file in SaveFile(), instead of simply dropping the reference if the existing file didn't contain a bitmap of the same size.
2012-04-20 03:57:22 +01:00
cba64ebc79
Explicitly dispose of bitmaps opened from files in GenericSystemDrawing and JPEG.cs
2012-04-20 03:46:33 +01:00
4ac2f839bd
Remember to dispose of the bitmap opened from a file in GatekeeperServiceConnector.GetMapImage()
2012-04-20 03:32:38 +01:00
63cda3a6d0
concerns GenericSystemDrawing.cs
...
in OpenSim\Region\CoreModules\World\Terrain\FileLoaders\GenericSystemDrawing.cs
Ln 67
Apply Justin's solution
Signed-off-by: Garmin Kawaguichi <garmin.kawaguichi@magalaxie.com>
2012-04-20 03:26:02 +01:00
ec6347f987
ubitODE - again avatar/terrain collision. Reduce new viewers interpolators efects reporting null velocity and aceleration when stopped near the right position, where they can still have instantanius large values that can get magnified by interpolators, specially using diferent timing estimation.
2012-04-20 03:17:36 +01:00
f3dda2d85d
Add more exception detail to Exception and IOException throws in BaseHttpServer.HandleRequest()
2012-04-20 03:12:25 +01:00
2b98e2f106
Stop teleports from dropping tall avatars through or embedding them in the floor when lured by short avatars.
...
This involves giving the ceiling of the Z-component in a lure rather than the floor.
Ideally we would give the exact float compensating for relative avatar height but it looks like that isn't possible with the parcel id format used in lures
2012-04-20 02:50:36 +01:00
65b3e13010
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-20 00:17:14 +01:00
aeb5aed5b7
changed - VolumeDetect and phantom setting interaction. Script VD(true) forces phantom ON. UI phantom off turns off VD. Other transitions should only change specific parameter. This is not as current SL. - Fixed volumedetect prims being wrongly removed from physics.
2012-04-19 23:01:22 +01:00
9b02e1cf4a
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-04-19 01:52:23 +01:00
beb7b8d189
Fix a logic error in app domain creation
2012-04-18 23:23:37 +01:00
c2be894330
Fx up estate settings
2012-04-18 23:23:01 +01:00
411bd0574d
Allow setting a specific target velocity on TeleportWithMomentum
2012-04-18 22:16:59 +02:00
525b7593e8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-04-18 20:09:52 +01:00
7a255efdb2
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-04-18 20:07:32 +01:00
ea73a03553
Don't re-add the assembly resolver for each script if not creating the appdomain
2012-04-18 20:01:41 +01:00
5936e0c376
Allow scripts in attachments owned by the NPC to control the NPC
2012-04-18 19:51:27 +02:00
08714a0d38
ubitODE still retouching character pid
2012-04-18 03:59:38 +01:00
7f42069295
ubitODE - retouch character PIDs
2012-04-18 03:02:28 +01:00
c85f9d681a
On "show part" command, show link number.
...
This replaces the Parts count which was rather pointless for a prim (it was either 1 if a child or the number of parts if the root).
This information is still avaliable on the "show object" command.
2012-04-18 00:39:39 +01:00
fc9f244a7d
Merge branch 'master' into careminster
2012-04-18 00:28:33 +01:00
b430c0162c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-18 00:00:09 +01:00
859646ef5c
minor: Add some method doc. Add warnings since calling SOG link/delink methods directly rather than through Scene may allow race conditions.
2012-04-17 23:54:51 +01:00
0fe0b2ceec
Prevent objects rezzed in sim from being seen as attachments and becoming uneditable or crashers. (Foxtail of death)
2012-04-17 23:39:41 +02:00
84891930aa
clean up some more logging spam in the jsonstore modules
2012-04-17 14:23:43 -07:00
4db518b9a3
Fix the Csharp 3.0 vs 4.0 problem in JsonStore initialization.
...
Cut down on the logging spam.
2012-04-17 14:15:17 -07:00
5ff2bda587
This commit adds a new optional region module, JsonStore, that provides structured
...
storage (dictionaries and arrays of string values) for scripts and region modules.
In addition, there are operations on the storage that enable "real" distributed
computation between scripts through operations similar to those of a tuple space.
Scripts can share task queues, implement shared locks or semaphores, etc.
The structured store is limited to the current region and is not currently
persisted. However, script operations are defined to initialize a store from a notecard
and to serialize the store to a notecard.
Documentation will be posted to the opensim wiki soon.
2012-04-17 13:45:27 -07:00
4bb72c9ffe
make the namespace for the ScriptModuleComms consistent with its file system location
2012-04-17 13:45:03 -07:00
9464fcebcd
ubitODE: prims - update managed dinamic parameters from unmanaged at ODE rate and not heartbeat.
2012-04-17 16:49:08 +01:00
9132c9e499
ubitODE: - character managed ode was only getting position etc from unmanaged at heartbeat rate like core ode. Now do it at ODE rate in move(..). UpdatePositionAndVelocity() called once per heartbeat is now empty.
2012-04-17 15:50:14 +01:00
d7e2454281
ubitODE: - made avatar/ground collision pid servo a bit softer since seems a bit unstable with small avas in AVI even if fine on my testsite - Removed reading of PID parameters from config files since that only serves to mess things up and adds more unknowns
2012-04-17 14:24:13 +01:00
cca6b6bd0d
Add TestGetChildPartPositionAfterObjectRotation()
2012-04-17 02:14:10 +01:00
74aa8eee12
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-17 01:54:54 +01:00
2f2181683c
Add test TestGetChildPartPosition()
2012-04-17 01:51:13 +01:00
ab1a3688e2
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-17 01:50:49 +01:00
7e1ab216e3
Move some public methods on WebStatsModule to private to reduce some static analysis complexity.
...
There's no obvious reason for these methods to be public.
2012-04-17 01:33:55 +01:00
24a0cc5261
refactor: Rename EstateSettings.IsEstateManager() to EstateSettings.IsEstateManagerOrOwner() to reflect what it actually does.
...
This makes it consistent with other parts of OpenSimulator that are treating ESTATE_MANAGER and ESTATE_OWNER as different entities.
As per opensim-dev mailing list.
2012-04-17 01:25:41 +01:00
36207b88ff
ubitODE: bug fix let avatars colide with volume detectors
2012-04-17 01:00:50 +01:00
5655239f44
Null reference in llGetObjectMass on a seated avatar.
2012-04-17 00:56:46 +01:00
e6ec83125b
Use INSERT OR REPLACE INTO sql in WebStatsModule for session update rather than separate insert and update statements
2012-04-17 00:46:43 +01:00
572440cd23
correct bug where f_invalid was being inserted on a webstats update for an existing session rather than d_world_kb
2012-04-17 00:33:23 +01:00
1bb3873338
Simplify WebStatsModule by removing the uncompleted migrations section.
...
Use "create table if not exists" instead.
Client stats data is transitory data that it is not worth migrating.
2012-04-17 00:19:36 +01:00
f213f55586
Fix bug in WebStatsModule where an exception would always be output on update if the user teleported to another region on that simulator.
...
This was because update was looking for an existing stats record unique in session id, agent id and region id.
But if the user teleports to another region then region id changes.
WebStatsModule promptly doesn't find the existing record and tries to insert a new one, but only session id is the primary key and that's still the same, which makes things go bang.
This makes the update search only on the unique session id.
This is only an issue with simulators that have multiple regions where the webstats module is enabled.
2012-04-17 00:02:58 +01:00
d30b18b1de
Merge branch 'ubitwork'
2012-04-17 00:09:04 +02:00
723015e4f0
fix ( http://opensimulator.org/mantis/view.php?id=5965 ) llGetObjectMass was bad for sitted avatars not checking for the null physicsactor
2012-04-16 21:58:25 +01:00
6480b72eda
ubitODE: - fix remove characters from default raycasts filters as older code (or camera is very odd) - Slow down avatar if velocity is higher than 50m/s as in chODE
2012-04-16 19:44:02 +01:00
adb629a416
Merge branch 'ubitwork'
2012-04-16 20:02:15 +02:00
fff5c61ae8
chODE: if character velocity > 50m/s apply breaks. In free fall this will give a terminal velocity +- 60m/s
2012-04-16 17:47:17 +01:00
04ed5519a5
chODE bug fix
2012-04-16 17:14:31 +01:00
f05a977afa
Let llCastRay use ubitODE raycast if avaiable plus a few changes/fixes that should be checked. PROBLEM: it will not detect nonphysical phantons :(
2012-04-16 16:35:35 +01:00
25a2f97bc2
added suport funtions for ubitODE raycastFiltered
2012-04-16 16:33:57 +01:00
03139f07d7
Downgrade an error log message to info because there is nothing we can do if
...
an asset is damaged so it should not spew red ink.
2012-04-16 17:32:30 +02:00
86a2169d73
ubitODE + physmanager: - Revised use of ODE collisions categories and bits(flags) for better use as filters together with top spaces (for example physical prims are on topactivespace and not physical are on topstaticspace) - Added new world raycast with filters. This blocks calling thread with a timeout of 500ms waiting for heartbeat ode thread signal job done. - Don't let ode bodies being disabled for 2 long except for vehicles. This is necessary to detect when the object is at rest at top of other and that is removed. Assume that vehicles can be enabled by used action.
2012-04-16 16:16:55 +01:00
3999822e13
Use chode character actor.SetMomentum() to force full restore Velocity in scenepresence TeleportWithMomentum(), since actor.Velocity was selected by original coders as the input of a desired velocity (even 'forces') that is modified by character conditions, like not changing velocity.Z if it is in free fall.
2012-04-14 05:07:52 +01:00
2c74e1bba8
Add GroupPosition and GetWorldPosition() checks to TestGetRootPartPosition()
2012-04-14 01:57:09 +01:00
6602dee2fc
Merge branch 'master' into careminster
2012-04-14 01:54:24 +01:00
da342d0b21
minor: make test names consistent
2012-04-14 01:53:40 +01:00
f61b234252
refactor: move common init code into SetUp() in SceneObjectSpatialTests
2012-04-14 01:52:16 +01:00
919972a440
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Archiver/InventoryArchiveWriteRequest.cs
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-04-14 01:51:20 +01:00
317aebcce6
refactor: put SOG position test in a separate TestSceneObjectGroupPosition()
2012-04-14 01:47:56 +01:00
40d01fb20b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-14 01:43:57 +01:00
3ae98611f2
Add simple RelativePosition and OffsetPosition checks to TestGetRootPartPosition
2012-04-14 01:43:03 +01:00
4bdd9d51bc
Correct whitespace error introduced by previous commit
2012-04-14 01:04:26 +01:00
4d652c7041
Missing or unimplemented LSL memory functions.
...
Implemented to behave as if scripts were LSO.
Signed-off-by: nebadon <michael@osgrid.org>
2012-04-13 17:08:00 -07:00
eeec1f32c6
Add very basic TestGetRootPartPosition() test
2012-04-14 01:01:28 +01:00
a366c05ae2
Added ability to exclude inventory items or folders when saving IAR files.
2012-04-13 23:31:12 +01:00
47ba9d9429
Merge branch 'master' into careminster
2012-04-13 23:29:10 +01:00
eced091689
Change threat level of osNpcStopMoveToTarget from Low to High to match other NPC functions, and change OSSL permissions name to osNpcStopMoveToTarget instead of osNpcStopMoveTo
...
Thanks to Oren Hurvitz for pointing out these mistakes.
2012-04-13 22:52:24 +01:00
1ad3fdb40b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-13 22:34:36 +01:00
ab7c0e7547
Remove hardcoded god requirement from osSetRegionWaterHeight, osSetRegionSunSettings and, osSetEstateSunSettings no matter the threat level.
...
Change threat level on osSetRegionSunSettings and osSetEstateSunSettings from nuisance to high to match similar functions.
If you had enabled these functions but had relied on the hardcoded god check in the code, then please adjust your OSSL permissions config.
Thanks to Oren Hurvitz for pointing this out.
2012-04-13 22:32:33 +01:00
b574d43c5d
Use presence absolute position to request raycast to camera. Used m_pos maybe a sitting offset. For reasons i don't understand that also seems to crash ode more when i let this rays colide with heighmaps (ubitODE with normal ode lib).
2012-04-13 20:34:56 +01:00
5da77e047a
don't do Animator.UpdateMovementAnimations() in scenepresence RegionHeartbeatEnd if agent is sitting. Also restore Velocity in teleportWithMomentum()
2012-04-13 17:50:03 +01:00
5e3a76361f
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-13 03:03:44 +01:00
fe65b51876
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-04-13 03:00:48 +01:00
08e509978d
Mantis 55025 Implement script time.
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-04-12 18:44:00 -07:00
4a67e8b98f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Interfaces/IEstateModule.cs
2012-04-11 23:35:27 +01:00
8be14095fe
HGFriendsModule: Type casts to fix compile error
2012-04-11 18:56:28 +02:00
1f4d3d3582
HGFriendsModule: Added optional user level based restriction to send friendship invitations to foreign users.
2012-04-11 18:52:07 +02:00
f2ede8c7e0
HGFriendsModule: add the scaffolding for supporting permissions pertaining to HG friendships. Snoopy take it from here.
2012-04-11 08:13:11 -07:00
78fd487a70
New OS scripting functions osSetTerrainTexture and osSetTerrainHeight as originally proposed in SL Jira ( https://jira.secondlife.com/browse/SVC-244 ).
2012-04-10 21:49:43 +02:00
4ab479bf58
Add uri to various log messages when region registration fails. Upgrade some debug log messages to error.
2012-04-10 20:40:59 +01:00
f9dd4ed89c
Do not timeout group member cache entry, as long as there are frequent group membership requests. These are caused by movements within the parcel boundaries.
2012-04-10 15:51:26 +02:00
c4a9eae961
make llGetGeometricCenter() work as in current SL. Now this is not real geom center but a average of positions relative to root prim ignoring prims details, so no need to use physics engine.
2012-04-09 23:33:42 +01:00
a45ff62adb
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-09 21:40:41 +01:00
67d4f1d66c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Interfaces/IScriptModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2012-04-09 21:40:03 +01:00
78c0028179
Mantis5502 implementation of some of the new constants
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-04-09 21:25:22 +01:00
39079a62c0
chODE and ubitODE always return prim mass (they where returning object mass on physical prims) so SOG can do the total add. (ubitODE as more code to use a simpler terrain geom on a modified ode lib but should do autodetect and work with normal lib).
2012-04-09 20:58:40 +01:00
87fdb2ed7e
llGetMass and llGetObjectMass (and push estimation) always use object mass as in current SL ( push is what makes sense or impulse will depend on what prim it is and not object). Added llGetMassMKS() that just returns 100 x llGetMass() as it seems to be in SL.
2012-04-09 20:53:29 +01:00
ad544bdd3d
sop.AddToPhysics(..) fixed and in use. For now it seems it needs to set sop.PhysActor, so made it return void.
2012-04-09 18:03:37 +01:00
0f277dfa17
Addresses mantis #5846
2012-04-08 17:54:59 -07:00
6b5b73bfae
Fix a LSL merge artefact
2012-04-08 13:18:03 +02:00
a25d12d166
Merge branch 'master' into careminster
2012-04-08 02:25:48 +01:00
d4a370a5f2
A few more minor improvements on Suitcase inventory service.
2012-04-07 14:52:15 -07:00
0d566aa385
Better Suitcase Inventory Service.
2012-04-06 21:52:48 -07:00
b39de2425c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-07 04:52:14 +01:00
806082cd6e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-06 20:35:01 -07:00
9637e50956
Moved the inventory manipulation from HGEntityTransferModule to HGInventoryAccessModule where it belongs. They need to exchange some events, so added those to EventManager. Those events (TeleportStart and TeleportFail) are nice to have anyway.
2012-04-06 20:34:31 -07:00
cce760dbfc
Rather than having a FromFolderID property on every single prim and only ever using the root prim one, store on SOG instead.
...
This reduces pointless memory usage.
2012-04-07 00:40:55 +01:00
7d8bb33c5b
Store FromItemID for attachments once on SOG instead of on every SOP and only ever using the root part entry.
...
This eliminates some pointless memory use.
2012-04-07 00:33:02 +01:00
70b5a2dace
refactor: Eliminate unnecessary SOP.m_physActor
2012-04-06 23:49:23 +01:00
33e91f1088
Implement PRIM_POS_LOCAL on llSetPrimitiveParams() and other prim params LSL functions.
...
This is the same as PRIM_POSITION
2012-04-06 23:43:03 +01:00
4a58d4c5a4
refactor: Use clearer part.ParentGroup.IsAttachment in LSL_Api.GetPartLocalPos()
2012-04-06 23:36:13 +01:00
3af1cd65f9
Fix llGetLinkPrimParams for PRIM_POS_LOCAL for child prims whether in scene or attachments.
...
Return relative position to root prim rather than 0,0,0.
Should fix same issue with llGetLocalPos()
http://opensimulator.org/mantis/view.php?id=5951
2012-04-06 22:41:35 +01:00
47108bb351
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-06 21:15:31 +01:00
f2903db390
For llGetMass(), return the mass of the avatar is the object is attached.
...
As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass
This is the mass as used by the physics engine (ODE or Bullet).
2012-04-06 21:14:19 +01:00
c3a8c00ce0
Addition of missing constants for llGetObjectDetails including for Mantis 5502
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-04-06 12:42:46 -07:00
627efc172b
Make llGetMass() return total mass of object when called on root prim.
...
As per http://lslwiki.net/lslwiki/wakka.php?wakka=llGetMass
Aims to resolve http://opensimulator.org/mantis/view.php?id=5954
2012-04-06 20:32:39 +01:00
908cebbea8
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-06 20:29:54 +01:00
6a9f36788d
Deleted the unused and commented code from 2 commits ago.
2012-04-06 12:28:15 -07:00
4c32f79c10
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-06 11:52:38 -07:00
7435582b70
If an AddItem fails, try adding it to the right folder type.
2012-04-06 11:52:05 -07:00
25b3edc21c
WARNING: LOTS OF COMMENTED AND UNUSED CODE IN THIS COMMIT. This is on purpose; it's an historical record of what works and what doesn't wrt manipulating inventory at the viewer. I'll remove the unused code in a subsequent commit, but wanted to place it in history. The uncommented code works.
2012-04-06 11:51:12 -07:00
953fe46811
A few minor tweaks here and there in XInventoryService.
2012-04-06 11:48:41 -07:00
6eaff18961
Finish the implementation of GetUserInventory, even though it's still not used.
2012-04-06 11:38:47 -07:00
8fd86c9156
Packing of folder in SendBulkUpdateInventory always set the folder type to -1. Not sure if there's a reason for it, but I'm changing it to the given folder type.
2012-04-06 11:24:34 -07:00
e324fb2415
Guard against null inventory contents.
2012-04-06 11:22:30 -07:00
cdbe34716f
Thank you, BaseHttpServer, for telling me where things go wrong.
2012-04-06 11:21:27 -07:00
67537f3596
Added missing refresh of group membership client side cache to the groups module. Before memberships of non active groups often were not stored in the cache (n_groupPowers).
2012-04-05 13:03:57 +02:00
8f45eb913c
Revert last commit
2012-04-05 11:10:05 +02:00
e4406c846d
Group based access restrictions to parcels require group membership, but not that this group is active for that user.
2012-04-05 10:25:54 +02:00
600a86bcae
Little bug fix in HasGroupAccess, to properly store the case "true" in the cache.
2012-04-05 10:02:18 +02:00
a5d6b624f6
Simplify group access checks and break them out into a separate method.
...
Use existing cache if the avatar is within the region and use an
ExpiringCache to cache status if the avatar is not in the region. The
30 second delay now applies to scripted objects ony and only when the owner
is not present.
2012-04-05 00:45:58 +01:00
36c8fa16c0
Implements group based access restrictions for parcels of land. Because of caching there can be a delay of up to 30 seconds until the access rights are effectively changed for a user.
2012-04-05 00:53:40 +02:00
6378abb966
Merge branch 'ubitwork'
2012-04-04 23:57:09 +02:00
77caa286a4
Remove some unneeded parens
2012-04-04 23:48:37 +02:00
c7419a4d61
Adjust Snoopy's contribution for AVN
2012-04-05 00:36:30 +01:00
3a0aac97b4
Merge branch 'master' into careminster
2012-04-04 23:57:50 +01:00
016079ef27
minor changes.. a few physicsactor -> pa and a use a constant with |'ed bit fields in place of 6 individual checks ||'ed
2012-04-04 18:24:56 +01:00
867d50d14c
remove more merge artefacts
2012-04-04 17:01:29 +01:00
787cc0d076
reverted changes to llApplyRotationalImpulse execution in SOP/SOG. This functions naming is misleading, Here Apply means to apply a instante impulse that may add to previus unprocessed ones and not setting a permanente torque (that is done by llSetTorque).
2012-04-04 16:38:29 +01:00
823895b997
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-04-04 15:43:07 +01:00
726915e9ef
Fix the last merge artefacts
2012-04-03 23:38:12 +02:00
1bded840b9
More artefact
2012-04-03 23:25:34 +02:00
dbec5e9859
Fix more merge artefacts
2012-04-03 23:22:47 +02:00
7154d480b9
Remove duplicate implementation of Material { get; set; }
2012-04-03 23:18:07 +02:00
1c4bcf3fed
Fix merge artefacts
2012-04-03 23:13:48 +02:00
63c44719f7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-03 23:52:53 +01:00
9a9923405a
terrain save-tile extensions Signed-off-by: Garmin Kawaguichi <garmin.kawaguichi@magalaxie.com>
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-04-03 20:06:03 +01:00
633f4bb3d8
remove possible PhysActor unexpectedly null race conditions when changing prim collision status
...
factor out common SOP physics scene adding code into a common SOP.AddToPhysics() that is the counterpart to the existing RemoveFromPhysics()
2012-04-03 09:28:17 +01:00
e480e25d8b
Fix more SOP.PhysActor race conditions in LSL_Api
2012-04-03 06:01:05 +01:00
7468299673
Eliminate race condition where many callers would check SOP.PhysicsActor != null then assume it was still not null in later code.
...
Another thread could come and turn off physics for a part (null PhysicsActor) at any point.
Had to turn off localCopy on warp3D CoreModules section in prebuild.xml since on current nant this copies all DLLs in bin/ which can be a very large number with compiled DLLs
No obvious reason for doing that copy - nothing else does it.
2012-04-03 05:51:38 +01:00
d5e123c106
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-04-01 11:20:11 +01:00
6e7f13a72d
Implement bulk inventory update over CAPS (not recursive by design,
...
do NOT CHANGE THIS, needed for HG 2.0)
2012-03-31 02:32:47 +01:00
a6c26b093c
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-31 02:31:57 +01:00
f3132c45d9
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Tests/Common/Mock/TestClient.cs
2012-03-31 02:18:02 +01:00
32a953fed7
refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the 'root' part.
2012-03-31 01:52:06 +01:00
f0406f9fe2
Rename SOG.HasChildPrim(uint) to SOG.ContainsPart(uint) to match existing ContainsPart method and remove method duplication.
...
HasChildPrim is also misleading since the 'root' prim can also be returned.
2012-03-31 01:45:37 +01:00
387d7fdad5
Allow llRegionSayTo() to work on the PUBLIC_CHANNEL, as per http://wiki.secondlife.com/wiki/LlRegionSayTo
...
Addresses http://opensimulator.org/mantis/view.php?id=5950
2012-03-31 01:29:13 +01:00
38d241a317
Add MSSQL login processing fix for servers run on different locales.
...
This may no longer be an issue with better locale enforcement in OpenSimulator but it doesn't hurt to have this patch.
http://opensimulator.org/mantis/view.php?id=4680
Thanks to controlbreak for this
2012-03-31 01:12:04 +01:00
69fc8c4985
minor: small message adjustment and unnecessary code elimination when notifying client of no build permission
2012-03-31 01:07:14 +01:00
874140f950
fix Infinite loading on No Rez http://opensimulator.org/mantis/view.php?id=5932
2012-03-31 01:01:59 +01:00
8728b9ea81
Implement bulk inventory update over CAPS (not recursive by design,
...
do NOT CHANGE THIS, needed for HG 2.0)
2012-03-31 01:34:39 +02:00
c4e4e04eee
reduced instability in vertical atractor with eficiency of 1 and banking
...
this will need a nicer solution sometime...
2012-03-31 00:03:45 +01:00
e5343bccdf
Add Extended flavour option to opensim version information.
...
This flavour is for changes in addition to the 0.7.3-post-fixes branch that are too large to be considered fixes but should be reasonably stable.
This flavour will almost certainly never see a formal release.
2012-03-30 02:11:32 +01:00
269e479cdc
minor: remove some now unneeded code from FriendsCommandsModule
2012-03-30 02:00:01 +01:00
3525c876c8
Make default "show friends" console command show friends fetched from the friends service.
...
There is no a --cache option which will show friends from the local cache if available.
2012-03-30 01:57:38 +01:00
1ef62ca75e
Lock NullFriendsData.m_Data for consistency and against concurrent read/write
2012-03-30 01:23:34 +01:00
bce7964ac2
refactor: Move "friends show cache" console command out into separate FriendsCommandsModule.
...
Expose required methods on IFriendsModule. Rename GetFriends() -> GetFriendsFromCache() for self-documentation
2012-03-30 01:05:29 +01:00
59157d9d63
Add simple login test with online friends. Add IFriendsModule.GrantRights() for granting rights via a module call.
...
Rename IFriendsModule.GetFriendPerms() -> GetRightsGrantedByFriend() to be more self-documenting and consistent with friends module terminology.
Add some method doc.
2012-03-30 00:42:55 +01:00
b8d383da0a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-30 00:38:23 +01:00
30db0ac5e2
Finish up the SuitcaseInventory service.
2012-03-29 16:25:55 -07:00
5e3999c84c
Cache the last maptile and return the cachrd tile if the last request is
...
less than an hour ago. Avoids generating the maptile twice on startup.
2012-03-29 22:34:33 +02:00
bf09d6a22b
refactor: Stop passing both IClientAPI and agentID to friend event listeners, these are redundant. Replace a few magic numbers with FriendRights enum already used elsewhere.
2012-03-29 18:31:57 +01:00
b9d61d5413
Allow the map tile module to be enabled without also eabling refresh
2012-03-29 15:38:12 +02:00
807bb85ac2
Allow llTeleportAgent to work in attachments
2012-03-29 14:45:56 +02:00
012b01f224
Add simple regression test for logging in with offline friends. Don't expect to receive any in this instance.
2012-03-29 03:19:45 +01:00
cd3f3cbdde
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-29 01:29:00 +01:00
22a85b947a
Add back parts of reverted changes that were not concerned with child agent caching.
...
This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin()
Also add a code comment as to why we're caching friend information for child agents.
2012-03-29 01:26:30 +01:00
62b1c807c2
Also add OSS header to interface
2012-03-29 01:14:50 +01:00
bd83676d6c
Change namespace on CallingCardModule and correct interface file placemant. Also ass OpenSource header
2012-03-29 01:13:08 +01:00
93ac47f0d3
Revert "Simplify friends caching by only doing this for root agents - no functions require caching for child agents."
...
We need to cache child agents so that friends object edit/delete permissions will work across boarders on regions hosted by different simulators.
This reverts commit d9f7b8549b
2012-03-29 01:08:47 +01:00
a1de9bc33f
Revert "Add comment about setting client.SceneAgent in AddNewClient()"
...
This reverts commit 964cae4f37
2012-03-29 01:08:37 +01:00
c52ff5cf7b
Committing the Avination calling card module
2012-03-29 00:47:09 +01:00
5a82d939e6
Adding the Avination calling card interface
2012-03-29 00:34:28 +01:00
532e3dad26
Pushing the Avination Calling card hooks. Module to follow.
2012-03-29 00:31:11 +01:00
964cae4f37
Add comment about setting client.SceneAgent in AddNewClient()
2012-03-29 00:21:14 +01:00
d9f7b8549b
Simplify friends caching by only doing this for root agents - no functions require caching for child agents.
...
This allows us to avoid unnecessary multiple calls to the friends service.
All friends functions originate from the root agent and only go to other root agents in existing code.
This also allows us to eliminate complex ref counting.
2012-03-28 23:40:25 +01:00
33df0c2efd
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-28 23:36:30 +01:00
6bf4d88397
HG 2.0 Suitcase inventory: proof of concept now working properly with the heavy SendBulkInventoryUpdate message. Waiting for Melanie to finish the light-weight version of that message.
2012-03-28 15:32:19 -07:00
874bf1f8e5
Enable voice by default on parcels to weaken effects of viewer 2/3 ParcelVoiceInfoRequest bug
...
Viewer 2/3 contains a bug where the viewer will constantly retry ParcelVoiceInfoRequest requests on voice-disabled parcels where voice is otherwise available.
Attempts to fix this server-side have not been successful - sending a non-OK http code (e.g. a 404) just makes the viewer request again immediately.
Dropping the request entirely is a bit better but the viewer still retries after a minute.
Estate settings already enabled voice by default so doing the same for parcels. This only has an effect if you have any voice system active at all.
Ultimately, the re-request bug needs to be fixed viewer-side (LL suffers from the same issue!) but it might be worth implementing the drop request hack.
2012-03-28 23:30:28 +01:00
51dc1e709c
HG 2.0: added the beginning of HGSuitcaseInventoryService. Plus moved the hack away from ScenePresence. This is better but it still doesn't restore the inventory upon arrival.
2012-03-28 15:01:37 -07:00
a85876bc17
Committing the Avination calling card module
2012-03-28 23:51:44 +02:00
7dad1ded2e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2012-03-29 00:27:35 +01:00
1888e174cd
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-28 17:51:56 +01:00
e73023b90b
Merge branch 'master' into careminster
2012-03-28 04:45:05 +01:00
03766c010f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 20:38:02 -07:00
af96b99356
More on switching the root folder from under the viewer. More experiments.
2012-03-27 20:36:54 -07:00
614c404923
Typo fix
2012-03-28 03:45:52 +01:00
4007f62158
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 19:09:03 -07:00
300968e933
HG: Switch root folders from under the viewer. Towards HG 2.0. This is guarded by an obscure config that no one but me should be using at this point.
2012-03-27 19:08:29 -07:00
b24605d526
Fix typos
2012-03-28 02:55:29 +01:00
514a9fdf8e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-28 02:52:11 +01:00
12d3ea3029
Add "friends show cache <first-name> <last-name>" command for debugging purposes.
...
This adds a reverse lookup (name -> ID) to IUserManagement instead of hitting the UserAccountService directly.
2012-03-28 02:51:34 +01:00
a43e804e59
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-03-28 02:46:31 +01:00
0463a00d34
Start on Bulk inventory update via CAPS. Not functional yet. HG v2
2012-03-28 02:45:50 +01:00
8c0f1e9058
Add a corresponding method for items. HG v2
2012-03-28 02:10:07 +01:00
710c14fb57
Add SendRemoveInventoryFolders which allows to remove one or more
...
folders from the viewer's inventory view. For HG v2.0. More to come
2012-03-28 01:49:06 +01:00
4ab63bfe97
Typo fix
2012-03-28 02:33:15 +02:00
caaf25c326
Merge branch 'master' into careminster
2012-03-28 02:56:31 +01:00
300488f862
Merge branch 'master' into careminster
2012-03-28 02:46:54 +01:00
b519cf6383
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Client/IClientInventory.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
2012-03-28 02:20:40 +01:00
445e8bc560
minor: Add some documentation to OnNewClient and OnClientClosed events
2012-03-28 01:08:56 +01:00
cb41fb64be
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-28 01:06:18 +01:00
2a8b9a47b2
Add SendRemoveInventoryFolders which allows to remove one or more
...
folders from the viewer's inventory view. For HG v2.0. More to come
2012-03-28 01:15:56 +02:00
b18b1b1d70
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-27 23:14:43 +01:00
37603ca6da
Reverse a conditional in XInventory that made updating system folder evrsion numbers impossible
2012-03-27 23:11:06 +01:00
db5f46fa23
Let grided simulators retrieve the user's inventory skeleton
2012-03-27 15:24:55 -07:00
b74a89bc12
minor: clean up some code formatting in VivoxVoiceModule.cs
2012-03-27 22:33:42 +01:00
5e07336672
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 14:25:36 -07:00
91950b3147
Amend to previous commit regarding the config name. Bugs bite.
2012-03-27 14:24:59 -07:00
de45fe7515
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-27 21:58:25 +01:00
19837ff4dd
Two new scripting functions osInviteToGroup(userID) and osEjectFromGroup(userID) that invite/eject users to/from groups the object containing the script is set to. These functions also work for closed groups.
2012-03-27 22:30:02 +02:00
5d37a31436
Merge branch 'master' of ssh://snoopy@opensimulator.org/var/git/opensim
2012-03-27 22:16:25 +02:00
7223b63563
User level based restrictions for HyperGrid teleports, asset uploads, group creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
2012-03-27 22:09:58 +02:00
971d32fda3
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 12:51:58 -07:00
0247d738e2
When loading objects from DB, first add to scene, then call TriggerOnSceneObjectLoaded.
2012-03-27 12:50:58 -07:00
a619621c60
Merge branch 'master' into careminster
2012-03-27 20:03:41 +01:00
de242a29ca
HG: beginning of a more restrictive inventory access procedure (optional). Experimental: we'll try switching the root folder from under the viewer.
2012-03-27 11:54:13 -07:00
6b5f3b49e7
Merge branch 'master' into careminster
2012-03-27 18:11:05 +01:00
2e2634896d
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 10:09:08 -07:00
8131a24cde
Send the config section name up to the service classes themselves (XInventory and Assets).
2012-03-27 10:08:13 -07:00
9efabe5e1e
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-27 12:07:52 +01:00
09c85a6a6c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-27 02:10:02 +01:00
1aa1a9eb3d
In TerrainModule.cs, the command terrain save-tile is modified to remove an unnecessary double argument "minimum Y tile"
2012-03-27 02:05:57 +01:00
0964af41be
Replace HG linker with core version
2012-03-27 01:46:02 +01:00
872d513daa
BulletSim: make avatar animations update properly.
...
It seems that ODE calls the avatar collision handling routine even
if there are no collisions. This causes the animation to be updated.
So, for instance, going from HOVER to FLY is caused by the physics engine
calling the collision routine each frame with 0 collisions.
2012-03-26 17:36:33 -07:00
caeaa03a69
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-26 23:04:07 +01:00
0bd0514e81
Merge branch 'master' into careminster
2012-03-26 16:47:02 +01:00
ad865ab4fc
Add some more overloads to allow registering overloaded methods and lists
...
of methods.
2012-03-26 16:46:07 +01:00
2fcdecf090
BulletSim: fix typo introducted by previous checkins (git merge sometimes makes mistakes)
2012-03-26 08:57:40 -07:00
f8879e06d2
Merge branch 'bulletsim1'
2012-03-26 08:49:12 -07:00
da9743d1d7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 14:22:49 +01:00
3810e98474
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 14:21:15 +01:00
7e0936e4b6
Add a hust UUID to the script invocations
2012-03-26 14:19:55 +01:00
055269805d
Fix compile error in ScriptModuelComms and add some debugging into the modInvoke
...
routines to simplify finding method registration issues.
2012-03-25 22:59:06 -07:00
98a6c78943
Fix the omission on the interface declaration
2012-03-26 03:33:39 +01:00
5f1f956d17
Fix the omission on the interface declaration
2012-03-26 03:32:30 +01:00
2c42dafe56
Fix Typo
2012-03-26 03:26:02 +01:00
e05c72d32f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 03:22:26 +01:00
c9c01d5226
Further simplify ScriptComms
2012-03-26 03:20:40 +01:00
ac0f1ff0a6
Dynamically create the delegate type to reduce complexity in the caller
2012-03-26 01:47:20 +01:00
d7cc194e83
Correct the design error I introduced into ScriptComms. Untested but about to
...
be.
2012-03-26 01:47:14 +01:00
5e8d64c943
Dynamically create the delegate type to reduce complexity in the caller
2012-03-26 01:21:44 +01:00
4b76c52c41
Correct the design error I introduced into ScriptComms. Untested but about to
...
be.
2012-03-26 00:30:52 +01:00
44f1f87656
Merge branch 'master' into careminster
2012-03-25 20:07:43 +01:00
cb44808504
Simplify the module invocation registration. The types and method name
...
can be pulled fromt he delegate so we don't need to pass them explicitly
2012-03-25 19:52:38 +01:00
a07fa0395f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-24 22:45:17 -07:00
a14437ad5a
Add support for key, vector, rotation and list types for both
...
arguments and return values to the modInvoke family of functions.
See http://opensimulator.org/wiki/OSSL_Script_Library/ModInvoke
2012-03-24 22:43:42 -07:00
88d5cb6eef
UbitOde let caller try to build meshs like done in chode. Changing this was a bad move i made. Variable colisions softness.
2012-03-24 16:04:13 +00:00
21a97408d4
Avatars have no bounce
2012-03-24 11:30:29 +00:00
4f17537555
Allow the user to enter help topics in upper or lowercase.
...
Forcing uppercase (e.g. help Assets) is too annoying.
Thanks to WhiteStar for pointing this out.
2012-03-24 03:07:01 +00:00
f03c3c062e
Hack example on to "terrain save-tile" extended help.
...
Thanks to Garmin Kawaguichi for the initially suggested text.
2012-03-24 02:41:45 +00:00
f53c6b2594
Use system provided temporary file in "terrain save-tile" to avoid problems with drive letters on windows
...
Thanks to Garmin Kawaguichi for picking up on this and providing an initial solution (which I adapted).
2012-03-24 02:30:43 +00:00
cf61c74e90
Give feedback when "terrain save-tile" is not successfully invoked.
2012-03-24 02:16:44 +00:00
07388071d4
Merge branch 'bulletsim1' of ssh://island.sciencesim.com/home/sceneapi/radams1/bs-opensim into bulletsim1
...
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSScene.cs
2012-03-23 16:20:53 -07:00
ff54b3c366
BulletSim: change default of shouldDisableContactPoolDynamicAllocation from False to True. It seems that collisions don't happen well when it is False (things fall through terrain).
2012-03-23 15:50:32 -07:00
3f53b7bc91
BulletSim: Add new configuration parameters to get and set console commands
2012-03-23 13:15:24 -07:00
142de1d02f
BulletSim: add a bunch of internal Bullet configuration parameters to OpenSimDefaults.ini and the code.
2012-03-23 13:15:23 -07:00
1273f259e4
BulletSim: remove confusion between angularVelocity and rotationalVelocity (there is still confusion in the rest of OpenSim). Enhance some debug statements to include the object ID.
2012-03-23 13:15:22 -07:00
1a738caeca
BulletSim: update TODO list. Rearrange code for readability. Add per object friction and restitution runtime settable parameters.
2012-03-23 13:15:18 -07:00
de24feb275
BulletSim: Add AvatarRestitution parameter. Centralize computation of buoyancy for flying. Tweek avatar default friction and resititution
2012-03-23 13:15:17 -07:00
6ecdadb329
BulletSim: set buoyancy in only one place
2012-03-23 13:15:16 -07:00
b22d040169
BulletSim: add some new runtime setable parameters to match the dll.
2012-03-23 13:15:14 -07:00
975184b3f9
BulletSim: Update list of TODO tasks
2012-03-23 13:15:11 -07:00
164706043d
Have the PhysicsParameters module output console command responses
...
directly to the console rather than logging at INFO (which doesn't
output anything for WARN).
There should really be a WriteLine method on ICommandConsole so all
of the different commands don't have to figure out where the command
output should go.
2012-03-23 13:11:58 -07:00
9a67baae21
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-23 14:24:55 +00:00
6b87a29c86
fix yield prolog so it compiles with mono 2.11 there has been a bugzilla
...
report files with mono project in regards to this change, this simply
lets us move forward with using mono 2.11 for now :
https://bugzilla.xamarin.com/show_bug.cgi?id=4052
2012-03-23 02:22:57 -07:00
1ae9ab685a
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-23 03:49:22 +00:00
d4beb2f5bc
Comment out log message about sending periodic appearance updates.
2012-03-23 03:39:39 +00:00
54887bf386
Add experimental SendPeriodicAppearanceUpdates = true/false setting to [Startup] in OpenSim.ini
...
On osgrid and other places, I have observed that manually sending appearance updates from the console often relieves grey avatar syndrome.
Despite hunting high and low, I haven't been able to find where this packet is sometimes being lost - it might be a persistent viewer bug for all I know.
Therefore, this experimental setting resends appearance data for everybody in the scene every 60 seconds. These packets are small and the viewer only fetches texture
data if it doesn't already have it.
Default is false.
2012-03-23 03:33:07 +00:00
4ed833bc9d
Add a scene maintenance thread in parallel to the heartbeat thread. The maintenance thread will end up running regular jobs that don't need to be in the main scene loop.
...
The idea is to make the critical main scene loop as skinny as possible - it doesn't need to run things that aren't time critical and don't depend on update ordering.
This will be done gradually over time to try and uncover any issues. Many non-criticial scene loop activities are being launched on separate threadpool threads anyway.
This may also allow modules to register their own maintenance jobs without having to maintain their own timers and threads.
Currently the maintenance loop runs once a second, as opposed to the 89ms scene loop.
2012-03-23 02:49:29 +00:00
fac89b6671
Merge branch 'master' into careminster
2012-03-23 02:46:49 +00:00
2190a62366
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-23 02:44:22 +00:00
ade164667f
Make anims way more snappy. Decouple SP animation handling from physics frame
...
time.
2012-03-23 03:16:07 +01:00
349454ca27
Remove unnecessary shutting down check in Scene.Heartbeat(). Add some method doc. Rename HeartbeatThread, shuttingdown to conform to code standards.
2012-03-23 01:46:11 +00:00
c0672cb7db
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-22 21:27:03 -04:00
176bba4f67
Merge branch 'master' of /home/opensim/src/opensim
2012-03-22 21:26:30 -04:00
18b3f1132e
Rename Scene.StartTimer() to Start() - this method no longer uses a timer. Comment out more effectively unused old heartbeat code.
2012-03-23 01:21:43 +00:00
4ee8b3e23e
Fix build break
2012-03-23 01:11:43 +00:00
a9995ede65
Fix bug in ScenePresenceAnimator.RemoveAnimation() introduced in commit 1a8769e
...
Forgot to uppercase the animation name for default animations, since for some reason we store and use them in upper rather than lowercase.
2012-03-23 01:08:13 +00:00
bc2963d42a
Comment out unused scene loop restart code.
...
This has actually been unused since at least 0.7.2 due to earlier changes.
2012-03-23 01:03:10 +00:00
08b8ebcc7e
Use m_lastFrameTick instead of m_lastUpdate in Scene.GetHealth(). m_lastUpdate is no longer properly updated and is redundant anyway.
2012-03-23 00:55:11 +00:00
c903813e00
RegionReady logging
...
Some maintenance to clean up logging messages
2012-03-22 20:49:45 -04:00
40b9b519b8
Add commented out section on collisions switch in Scene.SetSceneCoreDebug().
...
This was not implemented before the recent changes but should be at some point.
2012-03-23 00:12:14 +00:00
efe61b2481
BulletSim: remove confusion between angularVelocity and rotationalVelocity (there is still confusion in the rest of OpenSim). Enhance some debug statements to include the object ID.
2012-03-22 17:04:06 -07:00
15c2499ccd
Comment out login parameters debug output accidentally included with c4b2d24
2012-03-22 23:31:41 +00:00
c1d064e1ca
Comment out a terrain save-tile debugging message that accidentally crept in with c4b2d24
2012-03-22 23:16:52 +00:00
ed67b698d3
Merge commit '760010d6fb6aac313d79ce0a4d0016d3809246a0' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-03-22 23:05:58 +00:00
9edf99703a
Merge commit 'df624c13c98b06d57311c1d93ecbd4790553f3b3' into careminster
2012-03-22 23:01:50 +00:00
5bf45b9b98
refactor: simplify code for checks when part.OwnerID != destPart.OwnerID in MoveTaskInventoryItem()
2012-03-22 22:40:38 +00:00
760010d6fb
Fix llGiveInventory() so that it checks the destination part for AllowInventoryDrop, not the source.
...
This allows llAllowInventoryDrop() to work.
Regression test added for this case.
2012-03-22 22:33:37 +00:00
3bcf71c647
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-22 22:33:16 +00:00
c4b2d24f33
Add llGiveInventory() test from object to object where both objects are owned by the same user.
2012-03-22 22:17:07 +00:00
df624c13c9
HG Friends: don't notify if the server isn't there.
2012-03-22 15:08:57 -07:00
53b4551b58
Fix merge issue from core
2012-03-22 20:48:31 +00:00
6bc1ccf234
Change a false false to be truly true - or is this statement false?
...
Fixes perms boo-boo
2012-03-22 20:39:18 +00:00
3381899481
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-22 20:38:49 +00:00
b5d0bc2488
Rework Diva's patch to simplify it
2012-03-22 20:25:20 +00:00
45b588cf00
Revert "Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch."
...
This reverts commit 6146e7ef25
2012-03-22 20:10:38 +00:00
6146e7ef25
Simple build permissions feature. NOTE: EXPERIMENTAL, DISABLED BY DEFAULT. Turns out that this can't be expressed by cascading Permission modules, so I did it as per this patch.
2012-03-22 12:57:12 -07:00
9949ac2f9f
refactor: Rename AvatarAnimations -> DefaultAvatarAnimations for code clarity since non-default animations are handled completely separately from this class
2012-03-22 00:10:41 +00:00
71ec84d77f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-22 00:00:05 +00:00
1a8769e6ef
Instead of loading default avatar animations in both SLUtil and AvatarAnimations, load just in AvatarAnimations instead.
...
This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST.
This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND")
but scripts refer to them with lowercase names (e.g. "sit").
2012-03-21 23:57:39 +00:00
7783c93802
BulletSim: update TODO list. Rearrange code for readability. Add per object friction and restitution runtime settable parameters.
2012-03-21 16:16:47 -07:00
cb2727cf6e
BulletSim: Add AvatarRestitution parameter. Centralize computation of buoyancy for flying. Tweek avatar default friction and resititution
2012-03-21 16:16:46 -07:00
6c55fd93a3
BulletSim: set buoyancy in only one place
2012-03-21 16:16:45 -07:00
898a16802b
BulletSim: add some new runtime setable parameters to match the dll.
2012-03-21 16:16:44 -07:00
eafc3d6c47
BulletSim: Update list of TODO tasks
2012-03-21 16:16:41 -07:00
8652f277df
Revert "Stop messing order of updates, destroing the defined order of the selected priority (by distance being the one that makes sense(?). So called fairness serves no usefull purpose. If a region is lagged or user has bad comms, and far objects updates don't arrive, at least nearby thinks do have a chance to keep ticking. Just test on a big region and observe rez order on arrival. lower viewer bandwith helps seeing the diference. No use to put in core since cmic loves the priority scrambling code i comented out."
...
This reverts commit 68981d01f0
2012-03-21 22:45:34 +01:00
68981d01f0
Stop messing order of updates, destroing the defined order of the selected priority (by distance being the one that makes sense(?). So called fairness serves no usefull purpose. If a region is lagged or user has bad comms, and far objects updates don't arrive, at least nearby thinks do have a chance to keep ticking. Just test on a big region and observe rez order on arrival. lower viewer bandwith helps seeing the diference. No use to put in core since cmic loves the priority scrambling code i comented out.
2012-03-21 21:19:29 +00:00
4f593fa8c3
minor clean
2012-03-21 21:17:00 +00:00
5170cd7577
Updated the UserAccountsClient a little bit, plus some more sanity checks on the service connector.
2012-03-21 11:22:39 -07:00
4a9ca3ca8f
HG Friends: reroute the status notifications to the HGFriends service, so that they can scale better. They were previously being handled by the UAS; that is still there, but it's now obsolete and will be removed in a future release.
2012-03-21 10:35:06 -07:00
d8bcb78b10
HG Friends: pulled sim-bound notification code to HGStatusNotifier, so that we can better manage this traffic.
2012-03-21 09:14:17 -07:00
68736aa460
fix a bad reset of shapetype on pbshape change, added missing checksculpload ( to reload mesh on change )
2012-03-21 15:27:33 +00:00
8ad426f329
Removed extraneous debug message
2012-03-21 08:08:43 -07:00
1089e9b842
Removed extraneous debug message
2012-03-21 08:08:12 -07:00
a03c55fee7
missed a creatMesh in chODE. temporary removed m_meshfailed test since it may colide with how meshs and sculpts are loaded. This needs a good revision..
2012-03-21 14:03:50 +00:00
316f272b62
shapetype support on chOde so it can also request a simple convex hull 'mesh'
2012-03-21 12:57:46 +00:00
5abe1b4fce
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-20 21:36:46 -07:00
d49dd5573b
Removed extraneous debug messages. Added a check for UUID.Zero.
2012-03-20 21:36:02 -07:00
312f0c6970
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-21 02:45:33 +00:00
f6cbafcaf0
Changes of PrimShapeType should now work with UbitOde ( almost untested )
2012-03-21 02:39:16 +00:00
54a8a5baba
If "debug scene updates true" then print out to log when a garbage collection occurs.
2012-03-21 02:02:14 +00:00
11ed932263
Tell physics about physics shape when creating. Added some virtual methods to get/set density,gravmod, frition,bounce and shape type ( not in use ). UbitOde now should do convex type on creation or everytime the mesh is changed ( as in change size, shape, etc )
2012-03-21 01:46:41 +00:00
de53aa32e0
Add Scene.DebugUpdates switch which, if turned on, will print out a warning when a frame updates takes longer than twice the desired time
...
This is controlled via "debug scene updates true|false" on the region console.
Also fix an oversight with "debug scene teleport true|false"
2012-03-21 01:27:09 +00:00
2e41294da9
add convex state to mesh key, so a change is detected.
2012-03-21 01:24:30 +00:00
ab243f4a57
Incorporate scene teleporting debugging into "debug scene teleport true|false" command
2012-03-21 01:13:44 +00:00
9671e43497
Replace "scene debug true false true" console command with "scene debug scripting true" or other parameters as appropriate.
...
This is to allow individual switching of scene debug settings and to provide flexibiltiy for additional settings.
2012-03-21 01:02:58 +00:00
ee9210f656
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2012-03-21 00:26:02 +00:00
7a0d7be44c
Refix the fixed fix!
2012-03-21 00:17:58 +00:00
69a9a6993e
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-20 17:33:26 -07:00
91a001d3cf
fix compile error from last commit
2012-03-21 00:31:31 +00:00
9e8b194356
Fixed borkness with map search introduce by my last changes to it.
2012-03-20 17:29:34 -07:00
742acc0a3c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-20 17:26:18 -07:00
f7c61790b7
Fixed borkness with previous merge.
2012-03-20 17:25:52 -07:00
022366a074
refactor: simplify EstateManagementModule.handleEstateDebugRegionRequest()
2012-03-21 00:23:46 +00:00
841b4232f6
Line endings
2012-03-20 17:19:55 -07:00
3fa51f66ec
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
...
Conflicts:
OpenSim/Framework/Util.cs
2012-03-20 17:19:14 -07:00
d08ad6459a
HG Friends: allow the establishment of HG friendships without requiring co-presence in the same sim. Using avatar picker, users can now search for names such as "first.last@grid.com:9000", find them, and request friendship. Friendship requests are stored if target user is offline. TESTED ON STANDALONE ONLY.
2012-03-20 17:14:19 -07:00
d3a5cdd7c2
Merge branch 'master' into careminster
2012-03-21 00:09:18 +00:00
250b75f03b
Merge branch 'master' into careminster
2012-03-21 00:03:03 +00:00
7bf628ab31
Add ability to log warn if a frame takes longer than twice the expected time. Currently commented out.
2012-03-21 00:02:08 +00:00
117a862769
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-21 00:01:11 +00:00
5233e335e9
Move the health monitoring stuff where it will do some good
2012-03-21 00:00:32 +00:00
80a3b43e69
Merge branch 'master' into careminster
2012-03-20 23:59:49 +00:00
35c3124c3b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-20 23:39:02 +00:00
4c41b53a4b
Add prim name to "[MESH]: No recognized physics mesh..." log message
2012-03-20 23:35:50 +00:00
02f9caf6ce
remove some mono compiler warnings
2012-03-20 23:34:10 +00:00
3701f893d3
remove unnecessary tmpFrameMS, use maintc instead for frame time calculation
2012-03-20 23:31:57 +00:00
c39fba8f9d
minor: remove some mono compiler warnings
2012-03-20 23:19:11 +00:00
8bdd38b804
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-20 23:14:15 +00:00
30b2a8c778
Move frame loop entirely within Scene.Update() for better future performance analysis and stat accuracy.
...
Update() now accepts a frames parameter which can control the number of frames updated.
-1 will update until shutdown.
The watchdog updating moves above the maintc recalculation for any required sleep since it should be accounted for within the frame.
2012-03-20 23:12:21 +00:00
3d258d2688
Merge branch 'ubitwork'
2012-03-20 23:09:34 +01:00
8817b6e74c
let convex be a parameter to createMesh so it can be used. Was forced to add it also to original mesher code and zeromesher
2012-03-21 00:02:41 +00:00
23e6a31aa5
added convex decomposition hulls support. Hardcoded to use mesh or this. (so no simple hull of convex prims for now).
2012-03-20 23:38:04 +00:00
bd1f848bf6
slight increase in jump power to make running jump slightly better.
2012-03-20 14:17:15 -07:00
fdd4d787a4
Merge branch 'master' into careminster
2012-03-20 20:48:55 +00:00
9ed3532c1b
reduce avatar verticle jump from the absurd 5 meter jump to a less
...
absurd 3m vertical jump to better match what you would see in Second
Life and be more in line with what users would expect.
2012-03-20 13:45:38 -07:00
86bd287b53
refactor: precalculate the fixed movement factor for avatar tilting (sqrt(2)) rather than doing it multiple times on every move.
2012-03-20 20:39:33 +00:00
5f2a65c976
refactor: Eliminate unnecessary duplicate avCapsuleTilted
2012-03-20 20:28:58 +00:00
8c1550b58e
WORK in progress!! Now it reads the simple hull shape to use if convex shape is selected for a prim. Due to ODE limitations on convex hulls colisions, it creates a mesh. Being work in progress it is hardcoded to only read that simple convex hull for now. It writes a file named "lixo_lixo.raw" that can be imported into blender for examination of the created mesh (the last one loaded and also hardcoded). To play with put in opensim.ini "meshing = UbitMeshmerizer"
2012-03-20 19:24:45 +00:00
70c0d6cf0b
Merge branch 'ubitwork'
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-03-20 18:07:24 +01:00
7f7801ecb9
Cover the case where prims are loaded and ParentGroup is not yet set
2012-03-20 18:02:43 +01:00
efd7ff3146
add some more notifications about changes on physical parameters ( still incomple and there should be a better away )
2012-03-20 16:46:16 +00:00
f2d17433bb
Cause prims to be saved if extra physics parameters are changed
2012-03-20 12:34:06 +01:00
abd9957198
Fix an invalid cast that only showed at runtime
2012-03-20 12:24:42 +01:00
7779b1eabc
Store and reload extra physics from database
2012-03-20 12:04:55 +01:00
5768a151ff
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLXAssetData.cs
2012-03-20 02:48:11 +00:00
a3abd65e3d
Remove pointless ThreadAbortException catching in a test that isn't run anyway.
2012-03-20 01:41:32 +00:00
8c911ddaf0
Remove some pointless catching/throwing in the scene loop.
2012-03-20 01:39:19 +00:00
4cbaf053cf
Fix small typo
2012-03-20 00:53:33 +00:00
1c0f3a1f21
Fix crash where two scene loop threads could changes m_MeshToTriMeshMap at the same time.
...
Have to lock m_MeshToTriMeshMap as property is static and with more than one region two scene loops could try to manipulate at the same time.
2012-03-20 00:40:03 +00:00
e9271ec653
Add some doc about the EventManager.OnLoginsEnabled event.
2012-03-19 22:48:26 +00:00
e2b1c569da
Fix a bug where logins to standalones would fail if the RegionReady module was not active
...
Unfortunately, the OnLoginsEnabled event is currently only guaranteed to fire if the RegionReady module is active.
However, we can instantiate the AuthorizationService in the module RegionLoaded method since by this time all other modules will have been loaded
2012-03-19 22:45:03 +00:00
437f18bc41
Stop console command "xengine status" throwing an exception if there are no scripts in a region.
...
Addresses http://opensimulator.org/mantis/view.php?id=5940
2012-03-19 21:43:23 +00:00
618244f285
Remove debug output using Console.WriteLine and trim excessive whitespace
2012-03-19 14:39:19 +01:00
808995fb68
Merge branch 'ubitwork'
2012-03-19 14:25:11 +01:00
ab54ce1907
Fix configuration problems where XAssetDatabasePlugin was picked up accidentally.
...
The asset data plugin now implements IXAssetData rather than IAssetData so the ordinary AssetService should no longer pick it up.
This replaces the changes in 92b1ade
2012-03-19 00:18:04 +00:00
c7e302864a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-18 20:44:56 +00:00
d1256536b5
Added GetUUID(first, last) on UserAgentsService so that we can finally make direct user connections.
2012-03-17 21:27:28 -07:00
441ef301a3
Amend to previous commit: normalize strings ToLower.
2012-03-17 19:41:47 -07:00
7dfa0309c6
More on HG access control. This commit splits the UserManagementModule into the Basic one and the HG one, so that we can do everything that needs to be done for HG ACLs to work without interfering with the vanilla opensim. For the moment, it finds foreign users who have left a trace in the region, e.g. an object. This makes it possible to ban/IM/etc these users using the regular avatar picker. TODO: contact the UAS directly given a name of the form First.Last @foo.com.
2012-03-17 15:36:20 -07:00
1a4fdd2666
Moved HandleAvatarPickerRequest from the generic Scene.PacketHandlers to the UserManagementModule where it belongs. No functional changes.
2012-03-17 10:48:22 -07:00
d87a5758fb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-17 10:00:43 -07:00
33c14cb107
Region access control! Region operators can now specify things like DisallowForeigners (means what it says) and DisallowResidents (means that only admins and managers can get into the region). This puts the never-completed AuthorizationService to good use. Note that I didn't implement a grid-wide Authorization service; this service implementation is done entirely locally on the simulator. This can be changed as usual by pluging in a different AuthorizationServicesConnector.
2012-03-17 10:00:11 -07:00
41a0c850f8
added a new UbitMeshing module so i can mess it...
2012-03-17 09:27:56 +00:00
4a57112f19
Add osGetInventoryDesc() as per http://opensimulator.org/mantis/view.php?id=5927
...
This allows one to get description data for a given prim inventory item.
Thanks MarcelEdward and GuduleLapointe!
2012-03-17 04:02:23 +00:00
1e4180fc93
Clean up "save iar" help
2012-03-17 02:54:19 +00:00
a4dca88a57
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-16 13:08:27 -07:00
a2009ffe2e
Terrain: added [Terrain] section with an option to load an initial flat terrain. Default is still pinhead island. I much rather have a flat land in the beginning.
2012-03-16 13:08:05 -07:00
ae8e089b9c
some more work on costs
2012-03-16 15:33:49 +00:00
59b6f6a6e0
minor: reuse threadpool count we just fetched instead of fetching it again
2012-03-16 03:56:56 +00:00
bece2023e7
Add total scripts count to "show threads"
...
However, this returns 0 on Mono (at least on 2.6.7)! So not showing if it is zero.
2012-03-16 03:52:13 +00:00
9497a7c7bd
refactor: separate out console and status report generation parts of XEngine
2012-03-16 03:32:14 +00:00
922d8c9312
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-16 03:28:17 +00:00
6e8f80f1ab
Improve threadpool reporting to "show threads" console command (also gets printed out periodically)
2012-03-16 03:26:47 +00:00
05bb2e4275
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-15 20:22:59 -07:00
05a1493fff
More on map search: send extra messages to the user regarding the region being found or not, because the UI is horribly confusing -- places profile is always "loading..." whether the region exists or not.
2012-03-15 20:22:26 -07:00
421b562a04
Add process working memory to "show stats" memory statistics.
...
This shows the actual amount of RAM being taken up by OpenSimulator (objects + vm overhead)
2012-03-16 02:43:33 +00:00
aa881e8065
Allow comments to appear in command scripts (e.g. shutdown_commands.txt).
...
These can start with ; # or //
2012-03-16 02:07:26 +00:00
8550a4a07e
In Top Scripts report, don't show scripts with no or less than 1 microsecond of execution time.
...
This is to make the report clearer and less confusing.
2012-03-16 01:46:21 +00:00
c386b68373
Aggregate script execution times by linksets rather than individual prims.
...
This is for the top scripts report.
2012-03-16 01:31:53 +00:00
7df4a544fe
Fix owner name display in "Top Colliders" and "Top Script" region reports.
2012-03-16 00:53:36 +00:00
a4b01ef38a
Replace script-lines-per-second with the script execution time scaled by its measurement period and an idealised frame time.
...
The previous lines-per-second measurement used for top scripts report was inaccurate, since lines executed does not reflect time taken to execute.
Also, every fetch of the report would reset all the numbers limiting its usefulness and we weren't even guaranteed to see the top 100.
The actual measurement value should be script execution time per frame but XEngine does not work this way.
Therefore, we use actual script execution time scaled by the measurement period and an idealised frame time.
This is still not ideal but gives reasonable results and allows scripts to be compared.
This commit moves script execution time calculations from SceneGraph into IScriptModule implementations.
2012-03-16 00:34:30 +00:00
0548eeb571
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-15 16:03:33 -07:00
18d1d6d3b4
More on SLURLs and V3. This is hacky, but it works. Basically, we have to redefine the encoding of HG URLs because the viewer messes them up. Examples of what works and doesn't work:
...
- secondlife://ucigrid00.nacs.uci.edu|8002/128/128 <-- works throughout the viewer
- secondlife://http|!!ucigrid00.nacs.uci.edu|8002+Test+Zone+1/128/128 <-- works throughout the viewer
- secondlife://http|!!grid.sciencesim.com!grid!hypergrid.php+Yellowstone01+74/128/128 <-- works throughout
- secondlife://http%3A%2F%2Fucigrid00.nacs.uci.edu%3A8002%20UCI%20Central%201/128/128 <-- works in chat, but not as URLs in the webkit
2012-03-15 16:03:09 -07:00
df144eb9e2
Revert "Revert "More hacking around viewer bug""
...
This reverts commit e5612553ce
2012-03-15 14:55:25 -07:00
f52917288a
These SLURLs are very confusing! -- reverting the revert. Hack is, indeed, needed.
...
Revert "Revert "Hack around https://jira.secondlife.com/browse/VWR-28570 ""
This reverts commit 5a9560db28
2012-03-15 14:54:25 -07:00
5a9560db28
Revert "Hack around https://jira.secondlife.com/browse/VWR-28570 "
...
This reverts commit 697ac7fd9d
2012-03-15 14:36:48 -07:00
e5612553ce
Revert "More hacking around viewer bug"
...
This reverts commit 10731732b4
2012-03-15 14:36:29 -07:00
8b5298a62e
Protect the scriptmodulecomms interface.
2012-03-15 13:37:43 -07:00
402ff75d78
Adds a new script command 'modInvoke' to invoke registered functions
...
from region modules. The LSL translator is extended to generate the
modInvoke format of commands for directly inlined function calls.
A region module can register a function Test() with the name "Test".
LSL code can call that function as "Test()". The compiler will translate
that invocation into modInvoke("Test", ...)
2012-03-15 13:16:02 -07:00
fd4ad82367
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-15 11:06:08 -07:00
10731732b4
More hacking around viewer bug
2012-03-15 11:05:43 -07:00
697ac7fd9d
Hack around https://jira.secondlife.com/browse/VWR-28570
2012-03-15 10:17:02 -07:00
b4adf652e7
Merge branch 'ubitwork'
2012-03-15 10:24:40 +01:00
897dc5e77e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-03-15 10:55:44 +00:00
15ad5f492b
Playing with object costs CAPS ...
2012-03-15 10:25:18 +00:00
051ea18a4f
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-15 04:20:19 +00:00
84ca09f7c5
added ObjectPhysicsProperties http event message to send viewer that data. For now on caps/EventQueue, and still only used on a material change...
2012-03-15 02:24:13 +00:00
acb1355ff2
Remove property/field duplication in ScriptInstance where it's unnecessary.
2012-03-15 02:02:31 +00:00
2d32401e23
Simplify some logic in the ScriptInstance constructor - running is set to false in both if/else branches
2012-03-15 01:32:16 +00:00
f0c1746063
minor: correct indentation levels
2012-03-15 01:26:38 +00:00
5ddda89238
Remove duplication of m_RunEvents and Running
2012-03-15 00:48:44 +00:00
2f81e53f63
Fix a problem where multiple near simultaneous calls to llDie() from multiple scripts in the same linkset can cause unnecessary thread aborts.
...
The first llDie() could lock Scene.m_deleting_scene_object.
The second llDie() would then wait at this lock.
The first llDie() would go on to remove the second script but always abort it since the second script's WorkItem would not go away.
Easiest solution here is to remove the m_deleting_scene_object since it's no longer justified - we no longer lock m_parts but take a copy instead.
This also requires an adjustment in XEngine.OnRemoveScript not to use instance.ObjectID instead when firing the OnObjectRemoved event.
2012-03-15 00:20:47 +00:00
12cebb12d5
Alleviate an issue where calling Thread.Abort() on script WorkItems can fail to release locks, resulting in a crippled simulator.
...
This seems to be a particular problem with ReaderWriterLockSlim, though other locks can be affected as well.
It has been seen to happen when llDie() is called in a linkset running more than one script.
Alleviation here means supplying a ScriptInstance.Stop() timeout of 1000ms rather than 0ms, to give events a chance to complete.
Also, we check the IsRunning status at the top of the ScriptInstance.EventProcessor() so that another event doesn't start in the mean time.
Ultimately, a better solution may have to be found since a long-running event would still exceed the timeout and be aborted.
2012-03-15 00:06:52 +00:00
cf9ebd301c
bug fixs, added a default physics shape estimator based on being a mesh or not and use it on unlink if new root part as type none. Viewer doesn't get updated even with fullupdates we are missing something still
2012-03-14 18:24:04 +00:00
d1daea0108
Allow llTeleportAgent to teleport gods when not in god mode
2012-03-14 19:21:25 +01:00
c0f70d17fc
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-03-14 11:33:51 +00:00
d6dd3c42d1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-13 20:16:19 -07:00
479dd65a63
Teleports: bounce off repeated requests of teleporting the same agent. Some scripts do that, and that fails the whole thing.
2012-03-13 20:15:38 -07:00
5a09572393
Minor sanity check on simulation agent handler (content type)
2012-03-13 20:14:51 -07:00
95ec96bf86
refactor: rename ScriptInstance.m_CurrentResult to m_CurrentWorkItem to make it more understandable as to what it is and what it does (hold a thread pool work item for a waiting of in-progress event)
...
Also add other various illustrative comments
2012-03-14 00:29:36 +00:00
8388182707
Implement llSetPrimitiveParams for physics shape and material. Add
...
llSetPhysicsMaterial support.
2012-03-13 22:20:12 +01:00
d4e6834f99
Hook up the new cap to the SOP changes
2012-03-13 20:49:16 +01:00
f53c322b7e
Merge branch 'ubitwork'
2012-03-13 20:21:26 +01:00
577d07aa44
missed commit of extraphysics parameters serialization..
2012-03-13 19:51:41 +00:00
741badc4fa
let PhysicsShapeType none remove physics remove physics on child parts **UnTested**
2012-03-13 19:24:41 +00:00
bf2a5508de
bug fix
2012-03-13 19:17:32 +00:00
f415eb84e1
Implement the cap to send extra physics params to the viewer. Not functional
...
yet because the parameters are not actually stored anywhere yet.
2012-03-13 20:06:39 +01:00
923db53975
let checkheartbeat work ( bad ideia :p ) commited by mistake my local copy with it disabled...
2012-03-13 18:10:43 +00:00
5086fe9176
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-13 18:00:27 +00:00
3de3b9e63c
initial suport for ExtraPhysical parts parameters. Reading from llclientView to SOP including SOPserialization (not to databases). No action on physics still. No send to viewer, etc
2012-03-13 17:56:32 +00:00
37828c9b9a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-13 08:07:11 -07:00
4eb2605c79
Datasnapshot: added "secret" to the registration/deregistration query so that data providers can verify authenticity if they want.
2012-03-13 08:06:30 -07:00
22e0cc09ac
Ensure child prims of a phantom prim are marked as phantom
2012-03-13 13:12:14 +01:00
ebcd4910a2
Refactor, move OjectChangeData into it's own file and rename
...
ObjectChnageWhat what into ObjectChangeType change. What is
no name for a variable or type!
2012-03-13 13:08:32 +01:00
25592bbd85
Add max thread and min thread information to "xengine status" region console command
2012-03-12 21:16:05 +00:00
e0dd38f672
Rename the stream extension method WebUtil.CopyTo() to WebUtil.CopyStream().
...
.NET 4.0 added the method Stream.CopyTo(stream, bufferSize). For .NET 3.5
and before, WebUtil defined an extension method for Stream with the signature
Stream.CopyTo(stream, maxBytesToCopy). The meaning of the second parameter
is different in the two forms and depending on which compiler and/or
runtime you use, you could get one form or the other. Crashes ensue.
This change renames the WebUtil stream copy method to something that
cannot be confused with the new CopyTo method defined in .NET 4.0.
2012-03-12 10:07:04 -07:00
13fb582c12
DataSnapshot: renamed gridserverURL to gatekeeperURL, and normalimzed the capitalization of 'name' to lower case, also in the same <grid> section.
2012-03-12 07:55:17 -07:00
edc8a15487
Restore duplication of the SL bug where linking phantom to solid lets the
...
child prim remain phantom
2012-03-12 14:06:39 +01:00
bfd38ecad4
Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-12 11:45:38 +01:00
139c0665cf
Add AVATAR_MALE flag to return values of llGetAgentInfo
2012-03-12 11:44:07 +01:00
a35e00e81e
allocate UndoRedoStore only on demand
2012-03-12 07:50:14 +00:00
b5e172677d
ubitode prim select was not doing phantom case
2012-03-12 07:46:20 +00:00
6c4c500ee4
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-12 06:58:38 +00:00
2a17dafa04
missing file in ubitODE
2012-03-12 06:52:03 +00:00
44ce068d6c
Allow RLV to redirect received folders to #RLV folder
2012-03-11 18:21:47 +01:00
925295f3ab
ubitOde also knows a bit more about physical phantom
2012-03-11 12:33:59 +00:00
7832889437
Physical phantoms testable with chOde. Volume detection was changed and also needs testing. Started making it more independent of phantom acording to new sl. ** 99.999...% UNTESTED ***
2012-03-11 11:01:38 +00:00
dab7e03584
bug fix (??) in sog copy()
2012-03-11 08:43:53 +00:00
43dc0ee020
more phantom physics ( chODE and a fix in manager physicsactor
2012-03-11 07:44:34 +00:00
21a76a619f
initial steps to support physical phantoms
2012-03-11 06:32:06 +00:00
b0f01cec98
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-11 03:57:59 +00:00
824eb7ed20
Added osGetGridGatekeeperURI()
2012-03-10 19:51:28 -08:00
1f7c0c2ea0
cleanup + comments
2012-03-11 03:28:17 +00:00
53bda83cc2
cleanup + comments
2012-03-11 03:14:15 +00:00
80160c128d
coments change..
2012-03-11 02:58:56 +00:00
dba0d79833
minor changes on updates control on doChangeObject(..)
2012-03-11 02:55:39 +00:00
4f7ec1d691
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-03-11 01:55:36 +01:00
f292e19689
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
2012-03-11 02:29:43 +00:00
e4e6f781a6
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-11 00:53:53 +00:00
0a4056ad22
Merge branch 'ubitwork'
2012-03-11 01:47:36 +01:00
ab235abc46
Changed undo redo internals. moved exec code to UndoState.cs from sop that now only sees a unified UndoRedoStore class, added size limit on buffers so only last 5 undo/redo are kept. (5 is hardcode like it was ) ***UNTESTED***
2012-03-11 00:36:34 +00:00
908abb1c3d
BIG MESS. changed Iclient interface so only one event is used to inform scene about position scale or rotation change by client (others can be added). Its served at SceneGraph that does permition checks, undostore and sends down to SOG. changed values are stored in a class (ObjectChangeData) and what is changed as a enum (ObjectChangeWhat) with bit fields and 'macros' of this for better readability (at top of scenegraph.cs lasy to find better place for now) this can be extended for other things clients changes and need undo/redo. SOG process acording to what is changed. Changed UNDO/redo to use this also (warning is only storing what is changed, previus stored all, this must be checked for side efects. to save all PRS change commented line in scenegraph). Still have excessive calls to ScheduleGroupForTerseUpdate. **** UNTESTED ****
2012-03-10 20:32:19 +00:00
291dc39691
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-10 08:09:43 -08:00
05e821c444
Fix TestSaveOarNoAssets() by not launch a no-assets request on a separate thread.
...
This was previous behaviour anyway.
2012-03-10 03:11:28 +00:00
6e26f17923
minor: In IAR save, log when we start adding the control file rather than saying afterwards that we added it.
2012-03-10 02:13:17 +00:00
5507752dc5
minor: rearrange some save oar messages so they say what they're about to do rather than what they've just done.
2012-03-10 02:11:30 +00:00
1693799623
On OAR saving, try fetch assets serially rather than firing all the requests at the asset service at once.
...
This may (or may not) improve reliability for http://opensimulator.org/mantis/view.php?id=5898
Quick tests show that save time is the same.
2012-03-10 02:03:07 +00:00
d6ebf2d6ca
Add ability to specify a default estate to be used when creating regions.
...
This is configured in the new [Estates] section of OpenSim.ini.
If a default estate is configured then all new regions are automatically joined to it instead of asking the user.
If the default estate does not already exist then it is created.
Current default behaviour remains the same - the user is asked for estate details when necessary.
Thanks to Frenando Oliveira for the patch which I adapated further.
2012-03-10 01:27:05 +00:00
7b8e9d88e3
Serialize all web requests to a particular host:port pair; only applied to the PostToService variants.
2012-03-09 16:53:51 -08:00
bdc968f1fc
Factor out common default animations code into SLUtil. LLClientView now makes use of the SLUtil copy via a method rather than each LLClientView loading a separate copy.
...
As per opensim-users mailing list discussion.
2012-03-09 23:57:24 +00:00
3dbf754651
Merge branch 'master' into careminster
2012-03-09 23:00:24 +00:00
5c5a493791
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-03-09 22:59:23 +00:00
35f2479858
fix for NPC not playing internal animations
2012-03-09 22:58:59 +00:00
a58152bd2a
More on inventory transfer hold ups:
...
- Added an inventory cache for caching root and system folders
- Synchronized the remote inventory connector, so that all the remote inventory calls are serialized
This will not make much difference in the hold ups. We'd have to move the FireAndForget high up to AddInventoryItem, but that opens up a can of worms regarding the notification of the recipient... the recipient would be notified of the offer before the items are effectively in his inventory, which could lead to surprises.
2012-03-09 12:59:24 -08:00
81869c4a3f
More on HG inventory transfers. Move the FireAndForget higher up.
2012-03-09 09:48:12 -08:00
0e5e324a2c
ubitOde bug
2012-03-09 17:20:49 +00:00
e83a2181d0
on linking update linked parts physical flags acording to new parent ones ( untested )
2012-03-09 17:19:10 +00:00
13f340077c
let chode and ubitode find ode.dll on windows
2012-03-09 04:19:39 +00:00
f545d669de
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-08 19:32:21 -08:00
7db5ba7702
More on the freeze on HG inventory transfers: spawn a threadlet on the functional asset posts so that the client threads doesn't freeze (but the network posts are serialized).
2012-03-08 19:31:53 -08:00
06dda14505
Simplify minimap coarse location code by just reference SP.AbsolutePosition
...
This is rather than checking whether the avatar is sitting and doing its own calculation.
2012-03-09 02:50:57 +00:00
205c36d3a4
Get rid of unnecessary ParentID == 0 check on SP.Get_AbsolutePosition since this is handled by the necessary ParentPart check
2012-03-09 02:44:08 +00:00
94e58ff6b9
Use SP.ParentPart instead of ParentID in places where it's more efficient (saving extra null checks, etc.)
...
However, it looks like we should retain SP.ParentID since it's much easier to use that in places where another thread could change ParentPart to null.
Otherwise one has to clumsily put ParentPart in a reference, etc. to avoid a race.
2012-03-09 02:38:11 +00:00
b454326273
refactor: cleanup SP.HandleAgentSit so that everything is done within one if (part != null), rather than having unnecessary multiple checks
2012-03-09 02:33:48 +00:00
c22446ede0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-08 18:29:08 -08:00
8a34d1b710
HG inventory/asset transfers: serialize asset posts. I'm using the same pattern as suggested in the patch mantis #5921 . Testing it in this smaller context to see how it works.
2012-03-08 18:28:46 -08:00
73c47f7205
Remove a race condition from SP.Set_AbsolutePosition where we assume the ParentPart is still not null if the ParentID != 0
...
Another thread could come in and stand the avatar between those two instructions.
2012-03-09 02:22:22 +00:00
e1be1c5263
Merge branch 'ubitwork'
2012-03-09 02:11:25 +01:00
e5786ba043
more changes on undo/redo group scaling seems to work better
2012-03-09 02:56:14 +00:00
99c64f0645
Fix a merge artefact
2012-03-09 02:45:53 +00:00
dc5f831ca8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-09 02:39:14 +00:00
05cdf9bda9
more changes in undo/redo. Basicly moved control to llclientview.cs. later we can move back to a dispatcher function on SOG that handles the several cases( in a viwer independent way (?)) and calls current exec funtions. made cosmetic changes replacing decimals by hexs so bits are easier to read. Changed behavour of case 12 and 28 ( 0x0c and 0x1c) to make identical to 0x0d and 0x1d ( scale only and scale plus position). DOn't see 12 and 28 in use... cases 1c and 1d still broken
2012-03-09 01:53:58 +00:00
42a7a85062
FireAndForget scripted rez - port from Avination
2012-03-09 00:57:49 +00:00
ac577bf606
Merge branch 'master' into careminster
2012-03-09 00:56:52 +00:00
df4b06aed1
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-09 00:20:10 +00:00
034c9d6bcc
Merge branch 'xassetservice'
2012-03-09 00:19:42 +00:00
3c5bd7c35a
minor: move some compression related var setup inside compression if/then switch
2012-03-09 00:16:49 +00:00
0cbdf9dad2
Put big fat EXPERIMENTAL warning in xassetservice database plugin
...
This should not currently be used in any circumstances except for experimentation.
Database tables used by this plugin can still change at any time with no migration path.
2012-03-09 00:05:34 +00:00
9c8ef96301
Fixes mantis #5923
2012-03-08 15:55:43 -08:00
675d40357c
Hold a ref to the prim we're sat on rather than querying scene each time
...
the check for significant is carried out. Prevents a deadlock condition.
2012-03-08 19:14:34 +00:00
b0fc96c17d
Merge branch 'master' into careminster
2012-03-08 19:10:22 +00:00
3089344114
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-08 19:09:11 +00:00
b8c27252c1
Hold a ref to the prim we're sat on rather than querying scene each time
...
the check for significant is carried out. Prevents a deadlock condition.
2012-03-08 18:31:58 +01:00
fa2a64564a
Move "change region" command into general category
2012-03-08 02:24:37 +00:00
dfdb0e140c
Uses shorter AddCommand form for "show estates"
2012-03-08 02:23:52 +00:00
650d761c06
Display help commander topics in capitalized form - the commands themselves are still lowercase.
...
Also convert the estate commands to simply AddCommand() calls so that commands from two different modules can be placed in the same category
2012-03-08 02:17:45 +00:00
430304c176
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-08 01:59:00 +00:00
749c3fef8a
Change "help" to display categories/module list then "help <category/module>" to display commands in a category.
...
This is to deal with the hundred lines of command splurge when one previously typed "help"
Modelled somewhat on the mysql console
One can still type help <command> to get per command help at any point.
Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet).
Does not affect command parsing or any other aspects of the console apart from the help system.
Backwards compatible with existing modules.
2012-03-08 01:51:37 +00:00
3d3b81e676
changes on undo/redo (untested/incomplete). Think we may consider moving this mfrom SOP to client side. At least does seem to work a bit better ( again there wwas a issue on sop.copy )
2012-03-07 07:31:26 +00:00
6bdea15ecf
minor: make NPC tests run in a given order, comment out log lines in mock region data plugins, null out scene in script and npc torture tests, add other doc comments to torture tests
2012-03-07 01:11:37 +00:00
f8b1b86c3a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-03-07 01:05:32 +00:00
a1b28a61a6
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-03-07 01:04:09 +00:00
7769362687
Always zero the PhysActor on dupes to prevent side effects on the orignal prim
2012-03-07 01:03:26 +00:00
5884d08062
Fix merge issue
2012-03-07 00:58:01 +00:00
caa19862fa
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-07 00:51:59 +00:00
f3e04beb2e
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-07 00:51:24 +00:00
f3678d217f
Stop individually deleting objects at the end of each ObjectTortureTest.
...
We can now do this since the entire scene and all objects within it are now successfully gc'd at the end of these tests.
This greatly improves the time taken to run each test (by reducing teardown time, not the time to actually do the test work that we're interested in).
Slightly simplifies config read in Scene constructor to help facilitate this.
2012-03-07 00:31:18 +00:00
23aba007dd
Add documentation to make more explicit the difference between OnRezScript and OnNewScript in the event manager
...
OnNewScript fires when a script is added to a scene
OnRezScript fires when the script actually runs (i.e. after permission checks, state retrieval, etc.)
2012-03-07 00:04:24 +00:00
3376979923
Remove static m_MainInstance in LocalGridServiceConnector.
...
I believe this was originally required back when there could be two LocalGridServiceConnectors but this is no longer the case.
Having such statics makes performance testing much more difficult since they prevent GC of objects unless static references are explicitly nulled.
2012-03-06 23:51:50 +00:00
98251cdab3
Add sensor, dataserver requests, timer and listener counts to "xengine status" command.
...
This is for diagnostic purposes.
2012-03-06 23:21:17 +00:00
e9d8eb5a27
Remove unnecessary explicit ElapsedEventHandler in SimReporter
2012-03-06 22:31:25 +00:00
0be4ed3df4
Prevent scripted region crossings from crashing with prim limits enabled
2012-03-06 22:27:01 +01:00
17b1454d6f
Null PhysActor on SOP.Copy() to prevent clobbering the original one
2012-03-06 20:20:12 +01:00
0f4cdc0c5b
Explictly close down the StatsReporter so that we can shutdown its timer
...
This is another step necessary for the scene to be garbage collected between performance tests
2012-03-06 19:05:32 +00:00
de03d1ece0
Removed some whitespace errors - don't be naughty, don't use hard tabs!
...
Also removed commented code block.
2012-03-06 09:56:19 +01:00
cca94aaefc
make copied parts have diferent LocalIds than original. More building control for ubitODE. for all let physics know about linking of physical parts. Assume UNTESTED
2012-03-06 05:13:39 +00:00
f33654b62f
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-06 03:07:48 +00:00
b3449e998a
Fix TestSyntaxError() and TestSyntaxErrorDeclaringVariableInForLoop()
...
They were all failing assertions but the exceptions these threw were caught as expected Exceptions.
I don't think we can easily distinguish these from the Exceptions that we're expecting.
So for now we'll do some messy manually checking with boolean setting instead.
This patch also corrects the assertions themselves.
2012-03-06 02:30:22 +00:00
a92153ed88
Get all test methods in OpenSim.Region.ScriptEngine.Tests.dll to report that they're running
2012-03-06 02:21:19 +00:00
85198a45cb
Fix off by one error in script error reporting.
2012-03-06 02:01:47 +00:00
1dc03e5c4f
Simplify NPCModuleTests code by putting the NPCModule in an instance variable rather than making each test fetch it seperately.
...
Also rename instance variables in the test to conform to naming standards and for understandability
2012-03-06 01:47:43 +00:00
5004d0ad09
Merge branch 'master' into careminster
2012-03-06 01:45:20 +00:00
d44b7c486a
Go back to setting appearance directly in NPCModule.SetAppearance() to fix mantis 5914
...
The part reverted is from commit 2ebb421http://opensimulator.org/mantis/view.php?id=5914
2012-03-06 01:27:30 +00:00
af46650bae
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-03-06 01:18:37 +00:00
aa613dab1f
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-06 00:29:43 +00:00
5e77973667
Merge branch 'master' into careminster
2012-03-06 00:29:25 +00:00
413bc1e77e
Updates to MSSQL store for 0.7.3 to include:
...
* Telehub support
* Bugfix to Friends lookups
* Updates to Creator fields to store up to 255 characters for HG item creator storage
2012-03-06 00:27:49 +00:00
441449e240
Switch to sha256 from sha1 in order to avoid future asset hash collisions.
...
Some successful collision attacks have been carried out on sha1 with speculation that more are possible.
http://en.wikipedia.org/wiki/Cryptographic_hash_function#Cryptographic_hash_algorithms
No successful attacks have been shown on sha256, which makes it less likely that anybody will be able to engineer an asset hash collision in the future.
Tradeoff is more storage required for hashes, and more cpu to hash, though this is neglible compared to db operations and network access.
2012-03-06 00:14:21 +00:00
fd2b285b1b
remove unnecessary hash local variable
2012-03-05 23:50:41 +00:00
a7b61add99
Allow NPC to be removed by the owner of the parcel they're over.
...
Don't allow NPC creation unless the prim owner has rez rights.
2012-03-05 22:22:28 +01:00
f2653b9b8e
Teleport users to the cornfield when they are teleported with
...
llTeleportAgentHome(). Don't try to teleport NPCs.
2012-03-05 21:52:24 +01:00
7377e633c7
update ubitOde
2012-03-05 12:37:21 +00:00
97f0cff388
llListSort SL compatibility: When sorting strided list and the list
...
length is not a multiple of the stride, return the original list.
Also, enforce that sort is ascending only when the ascending
parameter is 1, and not when it is != 0
2012-03-05 11:54:06 +01:00
a647a37683
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-05 04:03:37 +00:00
c2a73a26b5
SL compatibility - return only points on segemtn, not ray in llCastRay
2012-03-05 02:37:51 +01:00
0ed4f24b34
A stab at making llEjectFromLand work in all cases
2012-03-05 02:14:27 +01:00
182f5efbe9
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-04 16:23:46 +00:00
6338996f87
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
2012-03-04 16:23:19 +00:00
33a154e446
Merge branch 'master' of /home/opensim/var/repo/opensim into v3_support
2012-03-04 10:42:37 -05:00
01fcd400d7
update UbitOde
2012-03-04 04:26:05 +00:00
99bb3ccb3d
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-04 04:11:38 +00:00
7c931037bd
update UbitODE
2012-03-04 01:40:12 +00:00
6dc4a6dfb1
Zero velocity when drag-copying
2012-03-04 00:06:07 +01:00
fc781f0894
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-03-03 17:08:01 +00:00
1f32730798
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-03-03 09:58:57 +00:00
3780df8a32
Make asset compression optional. Currently set to false and not configurable from outside MySQLXAssetData.
2012-03-03 01:43:36 +00:00
75dc8b1aed
Implement basic gzip compression for xassetdata
...
Whether this is worthwhile is debatable since here we are not transmitting data over a network
In addition, jpeg2000 (the biggest data hog) is already a compressed image format.
May not remain.
2012-03-03 01:28:58 +00:00
2535a4cafc
If asset data already exists with the required hash then don't rewrite it
2012-03-03 00:05:02 +00:00
94b323d1d8
Perform asset storage transactionally
2012-03-02 23:41:54 +00:00
7113b44bdd
Merge branch 'master' into xassetservice
2012-03-02 23:30:19 +00:00
98ad6ed255
comment out "[CAPS]: ScriptTaskInventory Request" log spam
2012-03-02 23:29:35 +00:00
e81b3502ef
Make xassetservice execute one query to retrieve the asset, not two
2012-03-02 23:26:03 +00:00
c2c102d33e
Remove outdated comment about checking attachment prims in Scene.PipeEventsForScript()
2012-03-02 22:52:26 +00:00
089fd61a3b
Allow a script to receive events if its root prim is in an area where it's allowed to run rather than checking its own prim.
...
This allows scripts to run in child prims that are outside region boundaries.
This is an interim patch applied from http://opensimulator.org/mantis/view.php?id=5899 though it does not resolve that bug
Thanks tglion!
2012-03-02 22:43:24 +00:00
bfcba0a417
This still causes terrain artefacts
...
Revert " fix my bug on ChODE terrain heightmap build"
This reverts commit aa77d1d486
2012-03-02 22:20:02 +01:00
458f295fdb
This still causes terrain artefacts
...
Revert " 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."
This reverts commit 15bc539bd4
2012-03-02 22:19:28 +01:00
d242d47e5c
OpenID auth needs hashing before authenticating
2012-03-02 15:05:06 -05:00
6fc350725d
Merge branch 'master' into v3_support
2012-03-02 15:02:09 -05:00
64a036b4cf
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-03-02 09:19:35 -08:00
8d249f8456
ScenePresence line endings and fix AllowMovement default to true.
2012-03-02 09:19:13 -08:00
f42fd7fb77
update ubitODE
2012-03-02 15:05:30 +00:00
6e3523e25e
minor: remove mono compiler warning
2012-03-02 04:08:07 +00:00
2a2656f629
Merge branch 'master' into xassetservice
2012-03-02 04:01:53 +00:00
be4199c3bc
Make XAssetService a de-duplicating asset service.
...
This is an extremely crude implemenation which almost works by accident. Nevertheless it does work.
It can be tested with the instructions at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service#Testing
It does not interact at all with the existing asset service or any data stored there.
This code is subject to change without notice and should not be used for anything other than gawking.
2012-03-02 03:57:55 +00:00
8fccd2b555
Send the right name and creation date on the BasicProfileModule.
2012-03-01 19:55:51 -08:00
e8779cd9e5
In ScenePresence, removed several private variables used to store public parameters. They were only used by the get/set and make code harder to refactor.
2012-03-01 19:22:05 -08:00
dd63cd1656
Start by adding XAssetService as a copy of the existing AssetService.
...
This is the start of exploring the creation of a bundled OpenSimulator asset service that does de-duplication and possibly file storage of assets.
Along the lines of coyled's SRAS, but not intended to replace, merely to act as a more performant bundled default.
Might end up nicking stuff from kcozen's patch at http://opensimulator.org/mantis/view.php?id=5429
More details at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service
Feedback and discussion welcome as commits are made.
2012-03-02 02:23:35 +00:00
ec48a2f32b
minor: Rename pCampbot console prompt to "pCampbot" rather than "Region"
2012-03-02 01:54:48 +00:00
94971bf3b9
Provide feedback on bot login states in pCampbot
2012-03-02 01:31:28 +00:00
d8c4985527
Move SenseRepeaters.Count check inside the SenseRepeatListLock.
...
No methods in the List class are thread safe in the MS specification/documentation
2012-03-02 00:28:37 +00:00
dcfd05c8ea
lock SenseRepeatListLock when added a new sensor during script reconstitution.
...
This is already being done in the other place where a sensor is added.
Adding a sensor whilst another thread is iterating over the sensor list can cause a concurrency exception.
2012-03-02 00:22:23 +00:00
8a375f3c30
Adds an OSSL command for regular expression-based string replacement. Parameters
...
are osReplaceString(string source, string patter, string replace, integer count, integer start)
The count parameter specifies the total number of replacements to make, -1 makes
all replacements.
2012-03-01 14:49:49 -08:00
7a88d21e59
Merge branch 'master' of /home/opensim/src/opensim
2012-03-01 14:20:46 -05:00
a2b0ed537e
Fix indexing on string trim
...
Thanks to zadark for pointing this out,
smxy for deciphering the ?: operator and
Plugh for the fix \o/ yay for IRC
2012-03-01 14:18:48 -05:00
0007711eb5
Use a fully stubbed out MockConsole for unit tests rather than inheriting from CommandConsole.
...
This is so that the static MainConsole.Instance doesn't retain references to methods registered by scene and other modules to service commands.
This prevents the scene from being garbage collected at the end of a test.
This is not the final thing preventing GC - next up is the timer started by SimStatsReporter that holds a reference to Scene that prevents end of test gc.
2012-03-01 03:23:10 +00:00
aabbbb32ff
Flick master up to 0.7.4
2012-02-29 23:45:14 +00:00
69c999033b
Revert "Fix authentication for OpenID provider"
...
This reverts commit 9f597c2d42
2012-02-29 15:52:15 -05:00
df75f5ae37
Merge branch 'master' of /home/opensim/src/opensim
2012-02-29 14:42:36 -05:00
afc9a7d3f9
Merge branch 'master' of /home/opensim/src/opensim into v3_support
2012-02-29 14:39:51 -05:00
9f597c2d42
Fix authentication for OpenID provider
2012-02-29 14:39:07 -05:00
ee4d3bfad2
ubitODE bug fix
2012-02-29 19:36:16 +00:00
a8f1cd7e86
update ubitODE to current working state
2012-02-29 19:32:23 +00:00
a0d75be56b
fix
2012-02-29 05:14:29 +00:00
42ddb0e88f
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitwork
2012-02-29 05:08:13 +00:00
5534cf8b57
chODE: bad meshs get a a basic box or sphere geom with setted prim size. They will not colide if non-physical and Will collide with land if physical. assume UNTESTED
2012-02-29 05:03:26 +00:00
a181fae722
Don't start pCampbot if the user doesn't supply bot firstname, lastname stub and password
2012-02-29 03:00:56 +00:00
40c838896c
Use correct casing of RegionSettings.Sandbox in the various database modules.
...
MySQL and MSSQL have it as Sandbox, sqlite as sandbox.
In various different places in every plugin the wrong casing is used...
Consistency, who needs it? Or one day sqlite can change to Sandbox.
2012-02-29 00:33:17 +00:00
670c7842a4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-02-29 00:03:55 +00:00
2fce7dd593
Call Dispose() via using() on SqliteCommands in WebStatsModule after use.
2012-02-28 22:54:21 +00:00
a813e7ffdd
Fixed two typos. White space cleanups.
...
Signed-off-by: nebadon <michael@osgrid.org>
2012-02-28 14:12:39 -07:00
a8a7bb549d
made box a little larger
2012-02-28 20:24:03 +00:00
1c7700db88
A few blind changes to go try to go around bad mesh little box replacement fail
2012-02-28 20:14:26 +00:00
f11ab97747
Fix and hook up llTeleportAgent
2012-02-28 20:51:19 +01:00
0fb50a8a9e
Implement llTeleportAgent
2012-02-28 20:48:31 +01:00
9bad3b846f
Really dirty hack to make sims start. Causes errors but the ting runs. Remove
...
when fixed right.
2012-02-28 10:37:46 +01:00
4268427ac3
Some clean up in WebUtil, remove unused ServiceRequest function.
2012-02-27 15:15:03 -08:00
a725b5e01e
Let inworld meshs colide as such and not as basic prim all the time. Removed also LOD, and outerskin on colision meshs.
2012-02-27 20:08:43 +00:00
960c575dd2
Merge branch 'ubitwork'
2012-02-27 10:35:38 +01:00
aee4ca2f1c
Fix vehicles going physical stopping llTargetOmega parts (boat radar)
2012-02-27 08:50:19 +01:00
d342008e5b
Fix NPC appearance setting to include attachments again
2012-02-27 08:49:19 +01:00
0d51c42f59
update ubitODE to my current working state
2012-02-27 02:10:03 +00:00
d46235f5a3
Merge branch 'ubitwork'
2012-02-26 21:17:31 +01:00
e5e5b94cbe
Make llSetKeyframedMotion prims waut at the borders of down sims and try again
...
periodically.
2012-02-26 21:16:24 +01:00
118986f150
added in chODE GeomTriMeshDataDestroy to explicity release internal trimesh data.
2012-02-26 17:51:43 +00:00
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
b86e7715a8
Improve "j2k decode" command to tell us how many layers and components were decoded, instead of just success/failure
2012-01-05 22:54:33 +00:00
e393b47da8
Merge branch 'new_modules'
2012-01-05 17:54:05 -05:00
2b4edd659f
Adding empty ISearchModule interface
2012-01-05 17:53:03 -05:00
5ea9740f1b
Add a "j2k decode" region console command that allows a manual request for a JPEG2000 decode of an asset
...
For debugging purposes.
2012-01-05 22:40:49 +00:00
da0fc3c8f5
Make "show asset" command available simulator side. Actually make the service command be "show asset" instead of "show digest" this time.
...
Last time I accidnetally just changed the usage message.
2012-01-05 21:11:32 +00:00
f06acc0a85
Add size and temporary information to "show asset" command
2012-01-05 21:05:10 +00:00
5b160f5b7b
Rename 'show digest' console command to 'show asset'
2012-01-05 20:56:29 +00:00
7319ba62dd
Move simulator asset info commands to an optional module from the connector. Make them conform with service side commands.
...
This stops them appearing twice when Hypergrid is enabled.
2012-01-05 20:51:49 +00:00
f2ff6d5186
Move asset commands from AssetService to AssetServerConnector so that we can harmonise the same commands on the simulator side.
...
No functional change.
2012-01-05 20:33:44 +00:00
50e459d265
recomment log messages I accidentally left uncommented
2012-01-05 19:44:06 +00:00
c201b54b85
Improve "app rebake" command to return a better message if no uploaded texture ids were available for the rebake request
2012-01-05 19:40:54 +00:00
da6c816204
Commenting out DataSnapShot message "Registering service discovery capability" for now.
...
Please uncomment if/when needed.
2012-01-05 17:10:38 +00:00
2c401b7359
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-01-05 08:12:34 +00:00
97ba3c9346
Small fix to GetWorldPosition to get closer to Avination sit behavior
2012-01-05 08:11:52 +00:00
e9296721c7
That needs to be callable from elsewhere!
2012-01-05 08:04:04 +01:00
85d82c8140
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-01-05 07:43:16 +01:00
1ebc9d04aa
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-01-05 08:15:33 +00:00
045f3b8b11
Clean up GetWorldPosition
2012-01-05 07:37:31 +01:00
32b8fa4a77
Prevent spurious "CHANGED_POSITION" during region backup
2012-01-05 07:37:09 +01:00
8fb70a2058
Add "appearance rebake" command to ask a specific viewer to rebake textures from the server end.
...
This is not as useful as it sounds, since you can only request rebakes for texture IDs already received.
In other words, if the viewer has never sent the server this information (which happens quite often) then it will have no effect.
Nonetheless, this is useful for diagnostic/debugging purposes.
2012-01-04 22:45:07 +00:00
0634c38505
Separate out rebake request code from cache validation code AvatarFactoryModule.
...
This allows some logic simplification and allows an external caller to manually request rebakes even if textures are uploaded (future command).
2012-01-04 22:22:46 +00:00
7e6c84c334
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-04 21:41:28 +00:00
3a64522267
Minor formatting changes and commented out log lines for future debugging of image manager (udp texture fetch). No significant functional changes.
2012-01-04 21:40:15 +00:00
3a2ac0e2ee
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-04 12:01:32 -08:00
fc391d4b10
Added EventManager.OnRegionStarted which is triggered when Heartbeat is started.
2012-01-04 12:01:18 -08:00
aa625da6a6
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-04 19:53:48 +00:00
82df5de5cf
Remove the pointless LLClientView.m_imageManager null check.
...
Despite the code comments we never actually null it.
2012-01-04 16:15:05 +00:00
ecf9824b63
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-03 16:52:53 -08:00
0ab2289cdc
Access to these static methods to serialize objects are useful outside of serializer
2012-01-03 16:52:08 -08:00
983b49c0c8
commented out "Prevented flyoff" log message for now as this becomes problematic with bot testing.
...
Please uncomment if still needed.
2012-01-03 18:25:31 +00:00
01eacd3a31
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-03 18:22:14 +00:00
e78a3913e0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-01-03 12:22:13 -05:00
2c8e72217e
Merge branch 'new_modules'
2012-01-03 12:20:49 -05:00
6941058824
Profile Updates
...
Update basic profile to use the replaceable interface, making configuration less error-prone. Add support to query avatar's home user account and profile service for regions usng the updated OpenProfileModule with Hypergrid.
2012-01-03 11:10:23 -05:00
fa79588a20
minor: add missing newlines to pCampbot usage statement
2012-01-03 15:42:36 +00:00
a6e305063e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
OpenSim/Services/Interfaces/IUserAccountService.cs
2012-01-02 21:41:36 +00:00
fac8c25851
Reduce accessibility of some J2KImage/LLImageManager properties and methods to reduce potential code complexity and make code reading easier.
2012-01-02 21:31:42 +00:00
014a86c26b
Adding commented out log messages and some minor formatting for future bug hunting. No functional changes.
2012-01-02 19:46:30 +00:00
87374274b9
Fix for failed http request status
...
Thanks "sendapatch" for fixes to llHTTPRequest status reporting.
2012-01-01 23:44:46 -05:00
56dbcae402
Bug fix in map tiles in standalone: the map has been blank since commit 01ae916bad r/17324 (Nov.18, justincc). But the root cause comes from commit 02e54c57c4 Author: Oren Hurvitz Date: 7/22/2011
...
This is a nasty situation. The map tile UUID is, in principle, stored authoritatively in RegionSettings. However, it also needs to be stored in the Grid Service because that's how other sims can retrieve it to send it in Map Blocks to non-V3 viewers. So every time the tile image changes, that change needs to propagate to the Grid Service, and this is done via RegisterRegion (ugh!). Interestingly, this problem didn't affect grids because by default AllowRemoteDelete is false, so the prior images aren't being deleted from the asset servers -- but they were not being correctly updated in the map either, the map was stuck with old images.
2011-12-30 21:32:28 -08:00
5d8ed077bc
Bring back the Hyperlinker to the Robust console. Moved the config to [GridService]. Changed all HG-related .inis, including HyperSimianGrid. No changes in user-facing inis.
2011-12-30 19:17:35 -08:00
5aad1f7afe
Default LocalToGrid to true. Fixes minor bug introduced yesterday where old robust UserAccount service would result is LocalToGrid at the sim being false.
2011-12-30 10:40:57 -08:00
967ea51980
Set the local grid flag in the user account through the simian connector
...
This should make bi-directional hypergrid work.
2011-12-29 16:37:16 -08:00
571efeddb2
Added UserManagementModule.IsLocalGridUser(UUID) to be used throughout region Scenes and Modules. Changed existing modules to use it instead of assuming that foreign = null account.
2011-12-29 16:12:06 -08:00
42f5394677
Added field LocalToGrid in UserAccount. Context: make HG work in Simian.
2011-12-29 15:39:12 -08:00
98ab3dffa3
Deleted two obsolete files in Inventory modules.
2011-12-29 15:33:04 -08:00
ef4d989f37
Deleted unused methods from HGAssetBroker
2011-12-29 15:21:56 -08:00
6974596e83
Fixed mix-up in UserAccount fields when passing UserAccounts remotely.
2011-12-29 12:34:57 -08:00
b756077269
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-29 12:18:22 -08:00
70e36ee2b4
HG: more adjustments for making HG Simian work. Added server_uri as new key on get_agent_home in UAS.
2011-12-29 12:17:58 -08:00
bde004c08e
Merge branch 'master' into careminster
2011-12-28 09:24:35 +00:00
5b52440e61
Introduce a LightShare kill packet ans send it when needed. Currently only
...
understood by AVN v0.3
2011-12-28 09:24:02 +00:00
bf4d727cd5
Fix permissions being lost and correct slam behavior, removing icompatible
...
code inherited from core and dead code.
2011-12-27 14:04:49 +01:00
ad1c6442cd
Remove a debug spam
2011-12-27 01:40:44 +01:00
b6cfe15c7c
HG: more / love for Xmas
2011-12-24 07:44:26 -08:00
41f6d6a5ff
Introduce a LightShare kill packet ans send it when needed. Currently only
...
understood by AVN v0.3
2011-12-24 16:18:01 +01:00
2e07d24199
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2011-12-24 01:46:04 +01:00
c4e16b26bb
Merge branch 'master' into careminster
2011-12-24 02:21:35 +00:00
c9dbcfbb31
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2011-12-24 01:43:44 +01:00
f2855d3668
Add setter for Acceleration on physics objects.
2011-12-24 01:41:32 +01:00
5b28e29530
Fix camera orientation for sit targets to use the prim actually sat on.
...
Now SL compatible.
2011-12-24 01:40:58 +01:00
04806e02ed
Add PRIM_POS_LOCAL as an alias to PRIM_POSITION for setting the position.
...
For SL compatibility only
2011-12-24 01:40:09 +01:00
f9a1fd5748
HG: one more adjustment with trailing /s
2011-12-23 15:08:13 -08:00
d38b8caf2b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-23 10:58:55 -08:00
26bb95fe3d
HG: AAdded a few missing /'s at the end of URLs
2011-12-23 10:58:30 -08:00
c6ce464dbc
remove the old region crossing handler
2011-12-23 10:13:32 -08:00
b8a914b15b
Merge branch 'master' into careminster
2011-12-23 01:00:34 +00:00
456c89a7a3
Fixes some problems with objects that attempt to cross a region boundary
...
into a region that does not exist. This is particularly problematic for
physical objects where the velocity continues to move them out of the
region causing an infinite number of failed region crossings. The patch
forces an object that fails a crossing to be non-physical and moves it
back into the starting region.
2011-12-22 16:59:51 -08:00
f394cb2e8f
fix the UsesPhysics flag to reference the physics flag rather than the temponrez flag
2011-12-22 16:21:32 -08:00
6b08c051a3
Enables processing of hypergrid links through simiangrid services. Thanks
...
otakup0pe
2011-12-22 15:31:51 -08:00
790ca65c84
Align default ODE_STEPSIZE with that already used through OpenSimDefaults.ini
2011-12-22 20:22:15 +00:00
7ccd8f8f1d
rename Scene.m_physicalPrim to PhysicalPrims since its public and access external as a property
2011-12-22 19:57:50 +00:00
eef6f92029
Merge branch 'master' into careminster
2011-12-22 19:52:59 +00:00
f7dbdba447
Remove unused m_physicalPrim parameter from SOG.ApplyPhysics()
2011-12-22 19:52:09 +00:00
48113f0fc8
Make it possible to force all prims to be phantom via the collidable_prim boolean setting in the OpenSim.ini config [Startup] section.
...
Naturally, default is true.
When set to false, "phantom" flags on prims can be set as usual but all prims remain phantom.
This setting is for test purposes.
This switch does not affect the collision of avatars with the terrain.
2011-12-22 19:44:52 +00:00
a15a58a7c1
Merge branch 'master' into careminster
2011-12-22 17:33:31 +00:00
469955889e
Region crossings redone: (1) removed WaitForCallback. Now that we are passing the entire agent with attachs in one big message we don't necessarily need to wait for confirmation. The callback sometimes is problematic and it adds delay to the process. (2) Z velocity sent to the viewer = 0. This is an heuristic; the Z velocity usually is negative, and it makes the viewer move the avie down. This only matters while the agent is in transit and therefore not being physically simulated by neither region. As soon as the receiving region receives CompleteMovement from the viewer, the position and velocity get corrected.
2011-12-22 09:30:06 -08:00
b72dd852b7
Merge branch 'master' into careminster
2011-12-22 16:58:38 +00:00
7f527814d5
And a typo fix
2011-12-22 16:57:49 +00:00
66a0471efa
Merge branch 'master' into careminster
2011-12-22 16:52:14 +00:00
6412349dec
Add a few comments, correct a merge artefact
2011-12-22 16:51:51 +00:00
2347593dac
Harmonizing SP with Avination
2011-12-22 16:48:52 +00:00
b970d4f976
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-22 16:37:25 +00:00
219ec7ef20
Fixing a bug introduced yesterday. This put the precondition test inside CheckForBorderCrossing the right way.
2011-12-22 08:18:03 -08:00
bb0c6a498b
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-21 15:17:44 -08:00
ddff2f246c
Moved an external test into the method that uses those preconditions.
2011-12-21 15:17:26 -08:00
651f9f47d0
HG: Verify that the user is local
2011-12-21 14:56:38 -08:00
41b02a7208
Remove unused SetAcceleration and add set on Acceleration parameter
2011-12-20 14:45:32 -08:00
ca6113a4d5
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2011-12-20 21:51:43 +00:00
fa0a71253f
Though the viewer warns about receiving this, not sending appears to break baked texture caching when crossing region boundaries.
...
Needs further investigation.
Revert "Stop sending the viewer its own AvatarAppearance packet."
This reverts commit 92039f295d
2011-12-20 18:54:15 +00:00
dd69c9fd20
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-20 09:53:05 -08:00
25cbba9bca
Fixed bug of avie going under the terrain when crossing regions in certain directions. This was a 1-off bug: the terrain was being placed in 127, 127 resulting in a bounding box if -2, 256. I placed it in 128, 128 resulting in a bounding box of -1, 257.
2011-12-20 09:43:39 -08:00
2b4ebe657c
Merge branch 'master' into careminster
2011-12-19 23:16:20 +00:00
87a2d8d51b
Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs as this is updating SOG/SOP.GroupID, which is arguably generic.
2011-12-19 23:03:45 +00:00
efa4284391
Merge branch 'master' into careminster
2011-12-19 21:30:57 +00:00
92039f295d
Stop sending the viewer its own AvatarAppearance packet.
...
The viewer warns in the log if it receives this.
Stopping this doesn't appear to have adverse effects on viewer 1 or viewer 3 - the viewer gets its own appearance from body parts/clothes and self-baked textures.
2011-12-19 20:13:48 +00:00
2899de1a5c
Stop unnecessarily sending the TextureEntry in client avatar updates.
...
As far as I know, viewers don't use this mechanism to recieve new TextureEntry data for avatars. This is done via the AvatarAppearance packet instead.
Tested this back to viewer 1.23.
Replacing with Utils.EmptyBytes since converting the texture entry to bytes on each AvatarUpdate (or which there are many) is not cost-free.
2011-12-19 19:19:05 +00:00
e8fbeeba5f
Fix race condition where the appearance update timer could be stopped just after another thread had started it on QueueAppearanceSave() or *Send()
...
However, the window for this race is very small, and the next queued appearance save or send would restart the timer anyway.
2011-12-19 19:08:24 +00:00
fc9400db07
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-19 19:07:35 +00:00
0b91ec8dd2
Migrate detailed "appearance show" report generation up to AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive).
...
Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25.
Adjust some method doc
Minor changes to some logging messages.
2011-12-19 18:58:05 +00:00
6baee2e10b
addresses mantis #5827
...
RAdmin - admin_save_oar fails if noassets parameter missing
thanks Michelle Argus
2011-12-19 11:51:03 -07:00
759f1d2dbe
Merge branch 'master' into careminster
2011-12-18 10:49:45 +00:00
c4f1906b0a
Make raycast more efficient by checking exclusion flags earlier
2011-12-17 12:57:20 +01:00
8a9a8ed5c9
Fix hit testing link sets properly. Fix raycasting for LSL.
2011-12-17 12:31:25 +01:00
4d065f0453
Provide user feedback on execution of "backup" region console command
2011-12-17 02:42:43 +00:00
684482352c
Fix bug where objects couldn't be set back to the "none" group.
...
This is handled by treating UUID.Zero as a special case.
Currently, asking for the "none" group returns nothing because XMLRPC groups, at least, is not properly handling this case.
It may be better in the future to have GroupsModule return an appropriate GroupsData structure instead or require the underlying services to behave appropriately.
This is a further component of http://opensimulator.org/mantis/view.php?id=5588
2011-12-17 02:35:08 +00:00
f9137c923b
Fix bug where objects could not be set to a new group if the group had been created in that client session, or if no other action has been performed on the object.
...
There were two problems here:
1) On object group update, we looked for the group is the IClientAPI group cache rather than in the groups service. This fails to groups created newly in that session
2) On object group update, we weren't setting the HasGroupChanged flag. This meant that the change was not persisted unless some other action set this flag.
This commit fixes these issues and hopefully addresses http://opensimulator.org/mantis/view.php?id=5588
This commit also moves HandleObjectGroupUpdate() to the GroupsModule from the Scene.PacketHandlers.cs file
2011-12-17 02:23:24 +00:00
964ec57ffe
Changed the async approach on close child agents. This may improve crossings a little bit.
2011-12-16 17:24:50 -08:00
99623894c7
Commented a couple of verbose debug messages.
2011-12-16 17:23:30 -08:00
7f019cc196
If a startup simulator script is present, run it after the normal region selection code rather than before.
...
This allows the script to change the selected region without having it immediately undone.
Thanks to Garmin Kawaguichi for this patch.
2011-12-17 00:27:19 +00:00
1bf05fbb1f
refactor: simplify methods in Scene.PacketHandlers.cs by using GetGroupByPrim() rather than retrieving GetEntities() and inspecting the entire list
2011-12-17 00:11:17 +00:00
a3a17e929e
Stop generating client flags when we send out full object updates.
...
These were entirely unused.
2011-12-16 23:20:12 +00:00
5c4056660f
Don't pass on ChaneWaterHeight event from EventManager is new water height is less than 0
...
This is to stop bad values and subsequent viewer crashes.
Thanks to Michelle Argus for this patch.
2011-12-16 21:16:01 +00:00
5d79f857b0
Comment out accidentally left in "Adding physics prim" log message
2011-12-16 20:54:28 +00:00
a9b39d6e5d
Tunnel [GroupsModule] DebugEnabled setting down into XmlRpcGroupsServicesConnectorModule so that we can record cache misses
2011-12-16 20:53:50 +00:00
8300bb651e
Sends the consistent child agent position upon creation of the child agent in other regions, as opposed to <128, 128, 70>
2011-12-16 09:33:22 -08:00
3bf699ad36
No functional changes. Changed the prefix of that log message [CONNECTION BEGIN] to [SCENE] because that's where the message happens.
...
Also changed the instantiation of a vector object to be done only once instead of every time we receive a position update.
2011-12-16 08:59:33 -08:00
7e4a2d69d5
HG minor bug fix and marked one method obsolete in UAS.
2011-12-16 08:48:29 -08:00
8013c0d2f5
Stop pointlessly setting the m_colliderarr[] to false in the ODECharacter constructor
2011-12-15 22:33:14 +00:00
c0ba99e5ad
Stop having to call SetHeight again in ScenePresence.AddToPhysicalScene() when we've already passed size information to the avatar at PhysicsScene.AddAvatar()
...
Eliminate some copypasta for height setting in OdeCharacter
2011-12-15 22:29:36 +00:00
99570d8ebb
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-15 21:59:01 +00:00
937c06db54
Code cleanup related to ScenePresence.PhysicsActor and OdeScene/OdeCharacter
...
Stop hiding RemoveAvatar failure, add log messages when characters are removed through defects or re-added unexpectedly.
Add commented out log lines for future use.
Use automatic property for PhysicsActor for better code readability and simplicity
2011-12-15 21:57:22 +00:00
58ba81ae4e
minor fix to MegaRegions, typo spotted by Ubit!
2011-12-15 10:49:15 -07:00
6f2d80cc93
minor: add some currently commented log lines for use in debugging
2011-12-14 21:27:47 +00:00
69f29cb53e
Merge branch 'master' into careminster
2011-12-14 19:50:43 +00:00
e830a77860
Simplify some manipulation of _taintedActors in OdeScene
2011-12-14 18:33:44 +00:00
a110a7bd6a
Eliminate _taintedPrimsH and _taintedPrimsL (and _taintedPrimLock) in favour of just a _taintedPrims HashSet.
...
There's no point maintaining a list because any pending taint operations are all carried out in the same call anyway.
2011-12-14 18:03:25 +00:00
cec88872ae
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-14 17:59:55 +00:00
84023c8162
Fix off by one bug in objects GrabbingBehaviour of pCampBot.exe
...
Also fix usage message.
2011-12-14 16:43:49 +00:00
898549d13e
Merge branch 'master' into careminster
2011-12-14 08:57:55 +00:00
f43e5f92fd
Just adding a comment to SendFullUpdatToClient
2011-12-13 23:34:59 -08:00
39736e52d8
Reorder clearing of upate schedule on SOP to before sending updates. Fix potential race condition.
2011-12-13 21:37:17 -08:00
b242ceda1e
In AvatarFactoryModule.SetApperance(), perform ValidateBakedTextureCache() in the same thread rather than on another one.
...
The caller is already an async thread from LLClientView so this doesn't hold up the client.
However, launching on a separate thread does remove the effect of m_setAppearanceLock
This was potentially allowing two different SetAppearance threads to interfere with each other, though this probably rarely happens, if at all.
2011-12-13 20:42:39 +00:00
df65245671
Spin off terrain save into a new thread and make it so that it uses the old
...
values for places where NaN are found.
2011-12-13 12:58:28 +01:00
6d1d1c0dbf
Comment debug spam
2011-12-13 00:36:44 +01:00
d18a9f22e7
Prevent a nasty deadlock on teleport
2011-12-12 23:43:45 +01:00
4dfd2c7d47
minor: remove pointless comment from OdeScene.cs
2011-12-12 19:31:50 +00:00
8418288e26
Make m_attachments private
2011-12-12 18:29:54 +01:00
afab4b276e
Remove spammy log messages when querying sim health
2011-12-12 13:51:31 +01:00
c34ab0ee66
Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and IsColliding
2011-12-12 02:43:38 -08:00
95d533ce8a
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2011-12-12 11:09:13 +01:00
52a4dbccbe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-12 11:42:22 +00:00
943b37b8e6
Send changed animation event asynchronously
2011-12-12 11:08:50 +01:00
3c55d2e776
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-12 00:41:53 -08:00
db8fd1eb9f
Added an option for extra settings within region ini file. Any non-hardcoded key-value string pair can be added per-region and referenced by any part of OpenSim with access to the RegionInfo
2011-12-12 00:21:19 -08:00
8ae824ff09
Mantis 5816: osParseJSON Decoding Problems
...
osParseJSON uses hand-crafted decoding that has two issues
* does not seem to handle top-level JSON lists
* does not seem to handle unicode text
thanks otakup0pe!
2011-12-11 23:25:12 -07:00
3a91085ac2
Implement handler for TeleportCancel inbound packet
2011-12-10 15:17:34 +00:00
323ffd7a89
Fix a regression that causes data from the attachments module to fail loading
2011-12-10 15:28:32 +01:00
db98698bbe
Prevent spurious error message when client tries to move a null item
2011-12-10 14:47:00 +01:00
6b080d57cb
Merge branch 'master' into careminster
2011-12-10 15:19:31 +00:00
3f42183797
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
2011-12-10 00:40:41 +00:00
e88ad5aab9
minor: remove a mono compiler warning
2011-12-09 23:55:54 +00:00
5f276c3212
Print out one log message for every missing baked texture, rather than two.
2011-12-09 23:54:39 +00:00
0daa5d8b4d
minor: comment out "unpacked appearance" log mesasge for now
2011-12-09 23:44:34 +00:00
f24898d049
Comment out ChildAgentDataUpdate.Pack() "Pack data" message for now.
2011-12-09 23:24:52 +00:00
13b1c8c173
Do some clean up Scene.cs log messages.
...
This prints out both exception message and stacktrace (Exception.ToString()) isn't enough on Windows.
This also uses m_log.*Format() which is more efficient than string concat.
2011-12-09 23:21:54 +00:00
af3cd00048
Get rid of IScene.PresenceChildStatus() which always had to execute a lookup in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
2011-12-09 23:07:53 +00:00
5f6a4c4111
Merge branch 'master' into careminster
2011-12-09 22:55:08 +00:00
fc27806e90
remove some unused fields in ScenePresence
2011-12-09 22:52:54 +00:00
cb0da425d5
Fix "fix-phantoms" help message. Thanks Garmin Kawaguichi.
2011-12-09 22:41:39 +00:00
94c242f792
Move client id check in Scene.Inventory.cs:UpdateInventoryItemAsset so that it doesn't trigger an exception if the item hasn't been found.
...
In this situation we will now put out a slightly more meaningful log error message instead.
2011-12-09 22:36:51 +00:00
4e9f50b878
Add commented log lines to FetchInventoryDescendents2 path for future use.
...
Haven't been able to resolve issue where attachments are removed by the viewer on relog on a localhost
2011-12-09 22:32:28 +00:00
00b36eb0fe
Restore the Avination way of position and angle calculation so resizers
...
work again.
2011-12-09 20:55:48 +01:00
07c26111af
Fix llGetLinkKey to report avatars properly
2011-12-09 16:36:25 +01:00
d913303875
Merge branch 'master' into bigmerge
2011-12-09 08:13:57 +00:00
63fe673af1
Revert "Revert "Stop performing the asset save part of baked texture uploading on the UploadBakedTexture cap asynchronously.""
...
This turned out not to be the upload texture issue.
This reverts commit 8721841fc3
2011-12-08 23:45:53 +00:00
50eebb5cba
Don't reply with an ack packet if the client is not authorized.
2011-12-08 22:00:59 +00:00
32d0ef89c6
Extend TestAddClient() to check that the first packet received is an ack packet
2011-12-08 21:45:02 +00:00
14e407aff3
Add OpenSim.Region.ClientStack.LindenUDP.Tests.dll back into the test suite
2011-12-08 20:55:38 +00:00
bc13855e64
Reactivate BasicCircuitTests.TestAddClient()
...
This checks that the initial UseCircuitCode packet is handled correctly for a normal client login.
2011-12-08 20:52:34 +00:00
0e265889dd
Remove unnecessary AgentCircuitData null check from Scene.AddNewClient().
...
The only caller is the LLUDP stack and this has to validate the UDP circuit itself, so we know that it exists.
This allows us to eliminate another null check elsewhere and simplifies the method contract
2011-12-08 19:25:24 +00:00
55de189752
minor: remove some mono compiler warnings
2011-12-08 18:56:07 +00:00
54360dd20e
When a client connects to a scene, send other avatar appearance data asynchronously to reduce hold up in the IN UDP packet processing loop.
...
This is already being done for the initial object data send.
2011-12-08 18:39:56 +00:00
f61e54892f
On a new client circuit, send the initial reply ack to let the client know it's live before sending other data.
...
This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before.
This may stop some avatars appearing grey on login.
This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity
This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces
2011-12-08 18:34:23 +00:00
3b991a2222
Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge
2011-12-08 18:30:09 +00:00
96539ffc79
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 18:29:19 +00:00
355cde464a
Simplify Scene.AddNewClient()
...
If sp becomes null right after we've checked or created it, then behaviour down the line is going to be wrong anyway.
So instead retain the check/create ScenePresence reference and use this.
2011-12-08 16:10:47 +00:00
8d7c353500
Merge branch 'master' into bigmerge
2011-12-08 05:47:45 +00:00
43732794dd
Remove a left over log output
2011-12-08 05:46:59 +00:00
1e4842eaba
Remove superfluous try block
2011-12-08 05:28:54 +01:00
7c7dd6269a
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-12-08 03:37:48 +01:00
ea1f5fb08d
Merge branch 'master' into bigmerge
2011-12-08 03:53:30 +00:00
603ad905e1
Adapt to justincc's remote admin refactor
2011-12-08 03:53:09 +00:00
50aa89dae6
Merge commit 'eda770e978c09c756d15ba62dbbf6ee34a61b2f5' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 03:24:25 +00:00
b459239833
Recover from an internal mess-up in the outgoing packet queues by creating
...
a new queue object.
2011-12-08 01:08:40 +01:00
dae58e0937
Remove warning in admin_save_oar xmlrpc method where noassets == true was comparing against an object rather than a string
2011-12-07 22:42:05 +00:00
2b4de8f881
Have admin_load_heighmap and admin_save_heightmap xmlrpcadmin methods return success = true on success rather than false
2011-12-07 22:40:23 +00:00
fb2f4f158c
Refactor RemoteAdminPlugin so that every xmlrpc method calls a common block of code to do password checks, etc., instead of copy/pasting this code into every method
2011-12-07 22:39:12 +00:00
eda770e978
Remove unused SceneManager.TryGetAvatarsScene()
...
It makes far more sense anyway to use TryGetRootScenePresence().Scene, in common with the rest of the code
This method could also return any scene for child or root agents, depending in which order the scenes happened to lie in the list
2011-12-07 21:17:13 +00:00
3d95015686
On an Exception in Scene.RemoveClient(), always remove the client (and SP) structure so that logout on unexpired packets isn't retriggered, causing the same exception
2011-12-07 18:43:48 +00:00
2b02d3dc84
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-07 17:33:06 +00:00
415b7b7ec4
Implement XMLRPCAdmin command admin_teleport_agent.
...
This allows someone with access to this command on the XMLRPCAdmin interface to teleport an avatar to an arbitrary region and/or position.
2011-12-07 17:31:57 +00:00
33c6067098
Trigger a Jenkins build
2011-12-07 11:21:50 -05:00
a8ed185c00
properly lock CapsHandlers.m_capsHandlers
2011-12-07 14:55:01 +00:00
e6272b8d56
Stop also adding an ordinary http handler when we set up a poll http handler.
...
It appears that this is entirely unnecessary since the poll http handlers are dealt with on a separate code path.
2011-12-07 12:28:42 +00:00
ccba04f345
Fix intersim object give messages
2011-12-07 01:27:52 +01:00
f317953290
Fix up intersim give messaging
2011-12-07 01:02:46 +01:00
d6486fe14a
Fix task inventory giving
2011-12-07 00:43:59 +01:00
62d0a0cdbf
Remove harmless merge artefact
2011-12-06 22:58:00 +01:00
8e542cfa03
Stop accidentally setting up the UploadTexture caps handler with the same url for all users
...
This meant that if a user exited the region, the UploadTexture handler would be effectively removed for everyone, causing subsequent failures.
This hopefully resolves the recent UploadTexture LLSD problems
This was a regression in 5640f2e (Thu Dec 1 23:24:15 2011 +0000)
2011-12-06 21:42:56 +00:00
5490a3e549
Fix phantom and temp flags not taking
2011-12-06 19:44:45 +01:00
28da235888
Merge branch 'master' into bigmerge
2011-12-06 19:01:05 +00:00
8721841fc3
Revert "Stop performing the asset save part of baked texture uploading on the UploadBakedTexture cap asynchronously."
...
This is a possible cause of the dramatic upswing in "Unable to upload... No handler registered for LLSD requests..."
Needs more investigation.
This reverts commit 1854c52ea3
2011-12-06 18:37:13 +00:00
136a6a6e0f
Make "show appearance" a synonym for "appearance show"
2011-12-06 18:36:11 +00:00
b9a461c5ad
In "appearance show", if a particular avatar is specified, print out texture UUID for each bake type and whether the simulator can find it.
2011-12-06 18:32:27 +00:00
ec4f217af8
Actually send the avatar data if an individual avatar is specified, rather than accidentally doing nothing
2011-12-06 18:06:29 +00:00
1b9eb52850
Allow "appearance show" command to take an optional avatar name
2011-12-06 18:03:16 +00:00
4be85eeaa5
Make it possible to manually send appearance information via the "appearance send" command for a chosen avatar as well as all
2011-12-06 16:42:44 +00:00
d33d12ba83
Provide feedback as to which avatars are resending appearance informion on "appearance send" console command
2011-12-06 16:07:24 +00:00
319507f521
Add test for not found response from GetTexture cap handler.
...
Add OpenSim.Region.Capabilities.Handlers.Tests.dll into test suite
2011-12-05 21:04:17 +00:00
af9ccfa15c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-05 20:50:44 +00:00
4567555c49
Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.
...
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
2011-12-05 20:44:20 +00:00
09c043fe52
Adapt GodsModule to core changes
2011-12-05 21:26:43 +01:00
5b07370ec4
Remove erroneous message about hyperlinks when entering an invalid region name
...
in map search.
2011-12-05 21:26:06 +01:00
bc17e2e9cf
Merge branch 'master' into bigmerge
2011-12-05 20:32:35 +00:00
47d0a50a19
Add the proper result code as per the LL announcement for llTransferLindenDollars
2011-12-05 20:02:27 +01:00
e7cb63fcf7
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-12-05 19:01:35 +00:00
66f4ce354f
Fix CHANGED_TEXTURE and CHANGED_COLOR.
2011-12-05 19:01:14 +00:00
37889eb3fa
For the GetTexture capability, if a data range is requested that covers the whole asset length, return HTTP PartialContent instead of NotFound
...
NotFound is obviously wrong, and this change stops viewer 3.2.2 (and v probably earlier) complaining in the log about missing textures that are actually present.
We still return PartialContent even if the range requested is a superset of the data range as per httpd's behaviour
https://issues.apache.org/bugzilla/show_bug.cgi?id=51878
Viewer 3.2.2 and very probably earlier appear happy with this.
Whether fixing this NotFound bug has any practical effect apart from resolve viewer log messages is unknown.
2011-12-05 18:35:03 +00:00
6362df1202
Serialize the Volume Detect field
2011-12-05 19:33:25 +01:00
1ece4feccd
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-12-05 19:08:19 +00:00
cc482ee865
Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge
2011-12-05 18:54:31 +00:00
2a8a46a32d
Fix CHANGED_TEXTURE and CHANGED_COLOR.
2011-12-05 18:32:40 +01:00
5ab536a1e9
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-05 17:10:51 +00:00
3281b99362
Strip CR from http responses and limit them to 2048 chars
2011-12-05 15:57:47 +01:00
b7c9eb4bf7
Don't allow deletion of a terrain from the database unless we have one to replace it with
2011-12-05 15:46:57 +01:00
68bdd0b7fe
Fix setting seated avatar position and make llSameGroup work as in SL.
2011-12-05 15:26:49 +01:00
35800d6a86
Reinstate setter for OffsetPosition to allow setting the offset by script
...
while seated
2011-12-05 15:26:22 +01:00
19d6aa2bc9
Don't allow position update on sitting avatar. Don't bounds check sitting
...
avatars as they will be crossed by the vehicle and not individually
2011-12-04 20:16:07 +01:00
a2d98c7293
HG: Added HEAD method to Helo service. This is the preferred method, but its wide use will have to wait a few releases. So the sims are still calling GET for now.
2011-12-04 10:10:09 -08:00
080dfcc9c9
HG: Renamed one method
2011-12-04 08:24:16 -08:00
ec8c93aa5e
Implement ChangeInventoryItemFlagsPacket handling
2011-12-04 12:35:01 +01:00
a82aea53f8
Split up test SceneHelpers to provide an AddChildScenePresence() call
2011-12-03 19:32:59 +00:00
a4d82895be
Remove T012_TestAddNeighbourRegion() and T013_TestRemoveNeighbourRegion() since they don't do anything useful.
2011-12-03 19:14:37 +00:00
3852f05e6e
Extend TestCreateChildScenePresence to make assertions both at CreateAgent stage and then at Scene.AddClient()
2011-12-03 19:10:32 +00:00
4919c60560
Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()
...
This required an option to be added to NullRegionData via ConnectionString for it to act as a non-static instance, so that regression tests (which only load this class once) don't get hopeless confused and complex to compensate.
Normal standalone operation unaffected.
2011-12-03 18:59:54 +00:00
ced820bd5e
Improve locking in AgentCircuitManager
2011-12-03 16:19:11 +00:00
c934901a05
Use GetAgentCircuits() to receive a copy of the AgentCircuitsByUUID dictionary rather than AgentCircuitManager.AgentCircuits directly in "show circuits" to avoid enumeration exceptions
2011-12-03 16:11:47 +00:00
aac3f2d04e
Add agent circuit number checks to TestCloseAgent()
2011-12-03 16:04:11 +00:00
aba42d8543
Correct SOP.GetNumberOfSides() to return 8 for meshes rather than 7
...
We are returning the actual number of 'sides', not the maximum index number.
Also minor format corrections.
2011-12-03 15:54:06 +00:00
e75bcd4c59
Workaround for mesh to correct the number of faces in GetNumberOfSides(). Meshs are handeled as sculpts but can have up to 8 faces (SL restriction the collada format can handle even more). The patch enables all LSL function that adressing faces to behave correct. Like llGetNumberOfSides(); llSetLinkPrimitiveParamsFast(); llSetPrimitiveParams(); llSetColor();
...
Signed-off-by: marc <mare@sounddog.net>
2011-12-03 15:49:19 +00:00
585fc5e79d
Update SP.PhysicsCollisionUpdate() doc.
...
It might be inefficient, but there are collisions every frame if the avatar is walking/standing on the ground or a prim surface
2011-12-03 02:51:17 +00:00
b66fe3e9ff
Add method doc to SP.PhysicsCollisionUpdate() to make it clear that it's called continuously even where there are no collisions
2011-12-03 02:45:02 +00:00
a009871827
Add basic TestFlyingAnimation() regression test
2011-12-03 02:39:21 +00:00
feef1dd732
Stop calling Animator.UpdateMovementAnimations() at the end of HandleAgentUpdate().
...
There's no point doing this if it's being called via PhysicsCollisionUpdate
2011-12-03 02:05:11 +00:00
f08aad8a40
For now, disable mechanism to limit avatar animation updates since this causes avatars to never reach the correct animation after some actions.
...
This reverts to situation where animation updates are made each frame on SP.PhysicsCollisionUpdate (though a packet is only sent if the anim actually changes).
m_updateCount was not being update on various avatar state changes, causing the correct animations to never be sent.
Always setting in HandleAgentUpdate() is not enough since the avatar is continually sending AgentUpdate packets.
One would need to identify all the conditions under which animations need to play out and set m_updateCount appropriately in SP.HandleAgentUpdate()
2011-12-03 01:47:12 +00:00
0ca8491bbe
refactor: Use just ScenePresenceAnimator.CurrentMovementAnimation rather than duplicating it with m_movementAnimation
2011-12-03 00:40:08 +00:00
5bbfb082dd
Use agent.Animator.CurrentMovementAnimation in llGetAgentInfo() rather than asking for a new determination
2011-12-03 00:33:24 +00:00
8185ce8b4a
Do a cagent.Anims != null check in SP.CopyFrom()
2011-12-03 00:30:13 +00:00
5ba8ca5662
Rename ScenePresenceAnimator.GetMovementAnimation() -> DetermineMovementAnimation() for better code readability
2011-12-03 00:27:21 +00:00
96c191f4fd
Stop SP.HandleAgentUpdate() and PhysicsCollisionUpdate() from being processed if we're dealing with a child ScenePresence.
...
Neither of these can have any effect on child agents
Now leaving warning about trying to set animation on a child agent active. Might temporarily pop up now and again.
2011-12-03 00:09:18 +00:00
054ebe8878
Stop some places where we're trying to reset animations in child agents where such requests are ignored.
2011-12-02 23:56:01 +00:00
2a6597f61e
Remove pointless Animator.TrySetMovementAnimation("STAND") in ScenePresnece constructor.
...
Comment was right - it is indeed useless since SP always starts off as child and TrySetMovementAnimation screens out child SP
2011-12-02 22:14:47 +00:00
1854c52ea3
Stop performing the asset save part of baked texture uploading on the UploadBakedTexture cap asynchronously.
...
This prevents a possible race condition where the client would be told all baked textures had updated before they were in the asset service.
The client would then trigger a set appearance which, after a delay, would send the avatar appearance out to other clients.
The race condition seems unlikely because of this delay but it's still possible.
Might help with grey avatar appearances.
2011-12-01 23:38:25 +00:00
5460f2e035
refactor: Separate the upload baked texture handler out from BunchOfCaps
2011-12-01 23:24:15 +00:00
516c3dfbbb
Remove some debug code that had snuck in
2011-12-01 16:12:09 +01:00
797982ee11
Implement llTransferLindenDollars
2011-12-01 13:30:10 +01:00
8f2d7881bd
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-12-01 11:56:40 +01:00
b60ff651a3
Merge branch 'master' into bigmerge
2011-12-01 12:16:59 +00:00
2a9c9ae340
Provide more user feedback when "debug http" is set
2011-11-29 21:53:15 +00:00
fa63054c4f
On "show caps", stop excluding the seed cap but do exclude it elsewhere
2011-11-29 20:37:03 +00:00
679a5f6c0b
With "debug http 1", show the path with the query string instead of just the path.
...
Also simplifies debug levels to just 0 and 1
2011-11-29 17:26:45 +00:00
658d02b5e9
Improve some of the debug help messages
2011-11-29 16:56:31 +00:00
a17f93ff44
minor: remove mono compile warning, a Vector3 can never be null since it's a struct
2011-11-29 16:31:10 +00:00
d3a46b03bf
tabulate "show caps" output for easier readability
2011-11-29 16:29:11 +00:00
ff0d020007
Correct mistake in "debug eq" help
2011-11-29 16:18:14 +00:00
b6b0bc7b32
Add "debug http" command for currently simple extra debug logging of non-event queue inbound http requests to a simulator
2011-11-29 16:15:52 +00:00
dc612d0f08
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
2011-11-28 11:06:38 +00:00
80148bf784
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-11-28 11:21:15 +01:00
19c10c892a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-26 17:20:20 -05:00
ea0fc7b12c
Add missing property to llGetLinkPrimitiveParams
2011-11-26 17:06:28 -05:00
4efd9a3b7b
When removing an LSL sensor for a script (e.g. through llResetScript() or state change), don't also remove sensors for other scripts in the same prim.
...
Hopefully fixes http://opensimulator.org/mantis/view.php?id=4448 and http://opensimulator.org/mantis/view.php?id=4452
2011-11-26 01:55:36 +00:00
86cc00aaa8
minor: formatting changes in Scene.PacketHandlers.cs
2011-11-26 01:52:12 +00:00
46e1bcb6b6
minor: remove mono compiler warning
2011-11-26 01:40:46 +00:00
bafea2282a
Rip out unused Scene.HandleFetchInventoryDescendentsCAPS().
...
This has been handled by WebFetchInvDescHandler.Fetch() for some time.
2011-11-26 01:39:23 +00:00
11c19b0d2e
Use the same web fetch handler for every request from every avatar, since it contains no instance code
2011-11-26 00:29:01 +00:00
c5b636469d
Stop locking the requests coming in to WebFetchInvDecHandler.
...
There's no technical reason for this as the methods are thread safe. However, it might have served to slow down requests.
2011-11-26 00:13:04 +00:00
95a686dbf5
Fix config so that you can have both WebFetchInventoryDescendents and FetchInvnetoryDescendents2 caps active at once
2011-11-25 23:45:29 +00:00
5b4fe23f7f
Resolve error where an unknown asset type would cause the fetch inventory descendents cap to fail.
...
Introduced just a few commits ago in 0688861
2011-11-25 23:43:57 +00:00
676d32974a
Implement the FetchInventoryDescendents2 capability using the same code as WebFetchInventoryDescendents.
...
Enabling this by setting Cap_FetchInventoryDescendents2 = "localhost" in the [ClientStack.LindenCaps] section of OpenSim.ini downloads inventory via http rather than udp in later viewers.
2011-11-25 22:46:42 +00:00
b785f204ce
remove some mono compiler warnings
2011-11-25 22:19:57 +00:00
0688861aa7
Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() conversion rather than the arrays in TaskInventoryItem
2011-11-25 22:15:29 +00:00
8c82ff16ad
Fix WebFetchInventoryDescendents cap to use Utils.AssetTypeTostring/InventoryTypeToString to convert types to strings
...
These cover a wider range of types.
2011-11-25 21:54:31 +00:00
0a0aa77cfd
Adding missing CrossBehaviour.cs file to fix build
2011-11-24 22:46:43 +00:00
8e32ce85a7
Remove bizarre call to PhysicsScene.Simulate(0) in Scene.GetNearestAllowedPosition()
...
At least on ODE, this wasn't doing any harm but there wasn't any point to it either
2011-11-24 22:45:29 +00:00
2ae5b40ca6
On pCampBot, add bot as a property on behaviours instead of passing it in every time
2011-11-24 22:36:45 +00:00
cbbd992df4
minor: remove mono compiler warning
2011-11-24 22:11:54 +00:00
a58f5b2f66
When setting packet level logging via "debug packet", apply to all clients, not just root ones.
...
Also adds scene name and client type (root|child) to logged information.
2011-11-24 22:08:34 +00:00
0a60e9537f
comment out a noisy log line I accidentally left in from the last commit
2011-11-24 21:30:40 +00:00
63c137820b
Stop passing a request handler to the initial caps.RegisterHandler in EventQueueGetModule since this is immediatley replaced by a poll server handler.
...
This allows us to comment out a bunch of code and simplify the codebase and readability.
2011-11-24 21:27:35 +00:00
0174e326e3
Add a "debug eq" console command for debugging.
...
This will log outgoing event queue message names if turned on.
2011-11-24 20:27:11 +00:00
decabe1181
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-24 20:22:17 +00:00
bdcfd6afee
Add disabled CrossBehaviour to pCampBot, which is designed to cross test bots between neighbouring regions.
...
Not yet enabled since there is a bug where the initial cross will work but all subsequent movements on the receiving simulator appear to fail.
2011-11-24 17:35:33 +00:00
a8270cb48c
Merge branch 'master' into bigmerge
2011-11-24 01:16:37 +00:00
89b2fb2ff4
Append asset ID to URL for storage requests to allow caching proxies to work with Simian
2011-11-23 16:41:30 -08:00
5485e3da46
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-11-23 16:11:17 -08:00
0cb33a5398
Line endings
2011-11-23 16:09:11 -08:00
11dfd7711b
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-11-24 00:54:52 +01:00
ed7ddeecf2
Print out what behaviours are active when pCampBot starts up
2011-11-23 22:18:10 +00:00
d145750e87
Add teleport behaviour to pCampBot
...
This teleports the bot to any other regions +/- 5 on the x or y axis.
Quite aggressive at the moment since teleports keep occuring at a 1-10secs random interval.
No checking yet to see if teleport was successful.
2011-11-23 22:05:11 +00:00
1126efdcd0
In pCampbot, change "show status" command to "show bots"
2011-11-23 21:33:54 +00:00
9ae0641871
Rename Bot.BotManager to Manager
2011-11-23 21:33:10 +00:00
e9f2a9bddb
get pCampBot to extract nearby and store nearby region information
2011-11-23 21:19:10 +00:00
617f139aac
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-23 21:10:50 +00:00
e394f83df0
Change random number generator property name in pCampbot
2011-11-23 18:00:41 +00:00
0738fc43e4
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-23 10:50:29 -05:00
d4e3a7fe81
Shell Environment Variables in config
...
Adding updated Nini and support to use shell environment variables in OpenSimulator configuration.
Nini @ https://github.com/BlueWall/Nini-Dev
2011-11-23 10:11:47 -05:00
b56410285b
Log error if we attempt to add/remove an OdeCharacter from the _characters list inappropriately
2011-11-22 22:46:25 +00:00
ace4324e75
Stop removing actor from the hash maps in OdeScene.RemoveCharacter() since this is now being down in OdeCharacter.DestroyOdeStructures()
2011-11-22 22:37:06 +00:00
af90b52731
Comment out uncalled OdeScene.UnCombine()
2011-11-22 22:28:46 +00:00
fcb066cb5f
Comment out unimplemented and uncalled RegionCombinerModule.UnCombineRegion()
2011-11-22 22:23:52 +00:00
d639f7fdf3
minor: remove mono compiler warning
2011-11-22 22:16:09 +00:00
b0fe0464af
Stop an exception being thrown and a teleport/border cross failing if the desintation sim has no active script engines.
...
This involves getting IScene.RequestModuleInterfaces() to return an empty array (as was stated in the method doc) rather than an array containing one null entry.
Callers adjusted to stop checking for the list reference being null (which never happened anyway)
2011-11-22 22:13:57 +00:00
daf99f8c0a
slightly simplify OdeScene.Simulate() by removing bool processtaints, since we can inspect count of taint lists instead.
...
also groups OdeCharacter.CreateOdeStructures() and DestroyOdeStructures() together
2011-11-22 21:51:00 +00:00
b89c48b1be
Improve the error messages returned if the HelloNeighbour call fails.
...
This is the message a region sends to its neighbours when it comes up
2011-11-21 22:06:43 +00:00
c4e4a29478
Slightly improve "Unable to space collide" logging message, though I don't think I've ever seen this.
2011-11-21 21:31:26 +00:00
4ddff7eb0f
Get rid of OdeCharacter != null checks since OdeScene._characters can never contain a null character.
...
Ignoring the ancient code glyphs not to do this....
2011-11-21 21:29:56 +00:00
82dc7886fc
remove unnecessary OdeScene._activeprims locking. Code is single-threaded
2011-11-21 21:15:15 +00:00
7480f2fd0e
Restore defects list. In hindsight, the reason for this is becuase we can't remove the character whilst iterating over the list.
...
This commit also removes locking on OdeScene._characters since code is single threaded
2011-11-21 21:04:24 +00:00
546259b2ff
simplify operation of OdeScene._perloopContact
2011-11-21 20:30:37 +00:00
25d9001de1
don't bother locking OdeScene._perloopContact in single threaded code
2011-11-21 20:17:36 +00:00
e33b0fa35b
don't lock OdeScene.contacts since only ever accessed by a single thread
2011-11-21 20:12:04 +00:00
e67ba0ad06
rename ODECharacter.AvatarGeomAndBodyCreation() -> CreateOdeStructures() to match existing DestroyOdeStructures()
2011-11-21 20:01:34 +00:00
063f0f5d97
refactor: Eliminate one line ODECharacter.doForce() method for code clarity
2011-11-21 19:58:37 +00:00
225b925f4e
Comment out calls to OdeScene.waitForSpaceUnlock() since that method does nothing right now
2011-11-21 19:48:31 +00:00
54789706f4
Reduce complexity of OdeScene.Simulate() by fully removing bad characters at point of detection rather than later on.
2011-11-21 19:45:22 +00:00
3becda919e
move geom/actor map maintenance into DestroyODEStructures()/AvatarGeomAndBodyCreation().
...
This saves us having to do it separately when a character capsule size is changed
2011-11-21 19:31:29 +00:00
4faac1f090
When changing avatar size in ODE, remove the old actor from the name and actor maps
2011-11-21 19:06:53 +00:00
898904d83d
When an ODECharacter is removed (e.g. when an avatar leaves a scene), remove the actor reference in OdeScene.actor_name_map rather than leaving it dangling.
...
This also largely centralizes adds/removes in OdeScene.AddCharacter()/RemoveCharacter()
2011-11-21 18:27:41 +00:00
cead87005b
Have ODECharacter and ODEPrim both use PhysicsActor.Name instead of maintaining their own properties
2011-11-21 18:06:04 +00:00
4fdcfd79e4
Actually remove PhysicsActor.SOPDescription this time
2011-11-21 17:55:54 +00:00
39c1ae2408
Chain SOP constructors together rather than having copy/paste code
2011-11-21 17:55:10 +00:00
58a1147870
refactor: Make SOP.Description an automatic property
2011-11-21 17:51:38 +00:00
e0887944a0
Remove unused PhysicsActor.SOPDescription
2011-11-21 17:47:30 +00:00
4485007fce
Instead of generating a new list for bad characters on every physics pass, keep reusing the same list.
2011-11-21 17:04:54 +00:00
bdb5ac96d9
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-11-19 22:39:15 +00:00
dec8b9c98d
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-11-19 22:26:41 +01:00
2206e2fc96
Remove the "[LOCAL SIMULATION CONNECTOR]: Did not find region {0} for SendCreateChildAgent" message
...
This is misleading since a simulator will call this method before successfully trying remote regions.
Also comments out spammy "[SIMULATION]: Stream handler called" AgentHandlers messages for now.
2011-11-19 01:32:21 +00:00
726ca72c47
minor: Make HelloNeighbour messages more informative
2011-11-19 01:27:06 +00:00
10a23a823e
Get rid of the spurious [WEB UTIL] couldn't decode <OpenSim agent 57956c4b-ff2e-4fc1-9995-613c6256cc98>: Invalid character 'O' in input string messages
...
These are just the result of an attempt to canonicalize received messages - it's not important that we constantly log them.
Also finally get the deregister grid service message working properly
2011-11-19 01:16:07 +00:00
b89534ad0a
Remove mono compiler warnings. Fix problem with co-ordinate given in deregister region message
2011-11-19 00:34:13 +00:00
d05d065d85
Improve some grid region log messages to express regions at co-ordinate (e.g. 1000, 1000) rather than meter positions (256000, 256000)
2011-11-19 00:29:52 +00:00
7a18078177
improve region deregistration log message
2011-11-19 00:10:29 +00:00
01ae916bad
Don't register a region twice on both official registration and maptile regeneration.
...
Maptile storage appears orthogonal to region registration
2011-11-19 00:07:34 +00:00
9c928e9dc6
For TerrainModule.SaveToFile(), don't bother throwing the exception onwards after printing out the error, since this method is invoked by users.
...
Still throwing the exception on the stream method since this invoked programatically
2011-11-17 22:15:46 +00:00
352672eaf2
Make "terrain save" more friendly by telling the user if we have saved and putting out a useful complaint message if we haven't for some reason
2011-11-17 22:13:32 +00:00
cacc028835
If the entire simulator is shutting down then don't bother to unload the scripts from the appdomain in XEngine.
...
All the other actions (script state save, etc.) still occur.
This makes shutdown where there are many scripts vastly quicker.
2011-11-17 21:03:08 +00:00
31736b1aac
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
2011-11-17 19:04:27 +00:00
d1c80efd41
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-11-17 19:15:41 +01:00
e9c386f6a6
Force a sim exit when hearbeat isn't restarting successfully
2011-11-17 19:15:11 +01:00
b6d83e9c0f
Stop OdePrim and OdeCharacter insanely overriding set LocalID to set their own private m_localID property but leaving get to return the then unset PhysicsActor.LocalId!
...
Instead, just have both subclasses use the PhysicsActor.LocalID property.
This restores collision functionality that fell away in 45c7789
2011-11-16 23:01:59 +00:00
bd01c4a5cb
Call public ForEach instead of using m_entities directly. No semantic changes, just cleanup
2011-11-16 02:33:56 -08:00
baa65d4a15
In AddNewClient, iterator over copy of entities rather than copying under read lock
2011-11-15 17:09:17 -08:00
e21949deaf
Comment out the vebose logging on HGFriendsModule.
...
Recent issues in http://opensimulator.org/mantis/view.php?id=5794 were not related to HG friends
2011-11-16 00:26:54 +00:00
9488b235d1
Fix the build break
2011-11-16 00:10:55 +00:00
33b1e385ec
Look up a homeURL only when it's not null, in addition to not being string.Empty
2011-11-16 00:01:21 +00:00
92dff85afb
Enable log message to tell us what type of url is being requested from a user's homeurl
2011-11-15 23:38:24 +00:00
31ffd5450b
Make tracked per scene thread names conform to the majorirty format.
...
This is <thread-name> (<region-name>)
2011-11-15 23:34:28 +00:00
aea547cd11
fix build break on UserManagementModule.
...
This also adds time since started to "show threads". Unfortunately these two changes got mixed in.
2011-11-15 23:24:51 +00:00
5b9fe4497d
Do proper locking of UserManagementModule.m_UserCache when getting.
...
This might help with
[USER AGENT CONNECTOR]: new connector to ()
[USER AGENT CONNECTOR]: Unable to contact remote server for GetServerURLs
[USER AGENT CONNECTOR]: Malformed Uri : Argument cannot be null.
Parameter name: uriString
2011-11-15 23:12:41 +00:00
29eb3b2eb5
improve formatting of "show threads"
2011-11-15 22:51:12 +00:00
ccae787d03
send a watchdog heartbeat for a poll worker thread when it's actually run
2011-11-15 22:20:44 +00:00
122304317c
temporarily increasing logging in HGFriendsModule for debugging
2011-11-15 22:14:31 +00:00
e11b9dddb6
distinguish between FriendsSimConnector and FriendsServiceConnector in log
2011-11-15 21:51:45 +00:00
7db38a351c
Add number of milliseconds since last update to "show threads"
2011-11-15 21:49:13 +00:00
94b1c16398
Dont' bother with a userAgentService != null check right after we've constructed it
2011-11-15 20:37:49 +00:00
828e4a5b09
Add comments about trying to avoid synchronous work off the EventManager.OnMakeRootAgent event since this is on the critical path for transfer of avatars from one region to another.
2011-11-15 20:26:42 +00:00
e16d7fe1da
Instead of having scene add/remove collision events directly to the OdeScene collision event dictionary, marshall them via a change dictionary first.
...
This is to avoid a complicated tri-thread deadlock on region crossing for avatars with attachments, where
1) XEngine starting up scripts can lock XEngine.m_Scripts and then try to lock OdeScene._collisionEventPrim while starting up a script due to avatar border crossing
2) An existing collision event will lock OdeScene._collisionEventPrim and then try to lock SP.m_attachments while trying to send the collision event to attachments
3) The avatar still entering the region will lock SP.m_attachments and then try to lock m_Scripts to start more attachment scripts.
2011-11-15 20:02:09 +00:00
45c7789b54
use a more efficient dictionary in OdeScene._collisionEventPrim rather than a list
2011-11-15 19:42:33 +00:00
a3c5f76942
Removed unused and mostly commented out SceneCommunicationService methods
...
As far as I can see, the SCS is only now used for informing neighbours of up/down status and possibly sending child agent updates and close requests
2011-11-15 18:16:43 +00:00
20f26eeb17
Remove unused RegionCommsListener/IRegionCommsListener.
...
All this is now being handled through IEntityTransferModule and SimulationService instead, and has been for some time.
2011-11-15 17:38:55 +00:00
64784bc0cf
remove SceneCommunicationService.OnAvatarCrossingIntoRegion. This stuff is not being used any more - it's now IEntityTransferModule and SimulationService instead
2011-11-15 17:30:58 +00:00
430821d837
Rename FetchFriendslist() -> CacheFriends() and RefetchFriends() -> RecacheFriends() to reflect their intended function
2011-11-15 16:12:35 +00:00
2b5b4ac167
refactor: rename m_NeedsListOfFriends => m_NeedsListOfOnlineFriends to better reflect its actual function
2011-11-15 16:05:08 +00:00
50803dfe2c
For clients that are entering a simulator from initial login, stop executing FriendsModule.FetchFriendslist() asychronously.
...
Executing this asynchronously allows a race condition where subsequent friends fetches hit a cache that FetchFriendsList() had not yet populated.
Changing this to synchronous may improve issues where a user does not see friends as online even though they are.
I don't believe synchronous is a problem here, but if it is, then a more complicated signalling mechanism is required. Locking the cache isn't sufficient.
2011-11-15 15:57:53 +00:00
8d0aaa359f
refactor: Don't create a new UUID for passing uuids to client - UUIDs are structs are so not passed by reference (and they're immutable!)
2011-11-15 15:05:10 +00:00
89632f3ea8
Add test for removing a friendship.
2011-11-14 20:56:56 +00:00
ed19284d85
Merge branch 'remove-scene-viewer'
2011-11-14 12:37:48 -08:00
df35720cf5
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneViewer.cs
2011-11-14 20:34:49 +00:00
17f32b7773
Fix build break
2011-11-14 20:33:39 +00:00
e5ff7f389b
Improved method doc for AddFriend() - it actually does set up a two-way relationship.
...
Rename IFriendsModule.AddFriend() to AddFriendship()
2011-11-14 20:31:16 +00:00
afca742392
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2011-11-14 20:03:47 +00:00
a64def8b73
minor: remove some mono compiler warnings
2011-11-14 18:16:14 +00:00
348d15707d
Add test for adding a friend whilst online
2011-11-14 18:08:02 +00:00
de895ee54a
Add very simple FriendsModuleTests.TestNoFriends()
2011-11-14 17:18:51 +00:00
ff36a1bc7b
If a friends identifier which is too short is given to HGFriendsModule.GetOnlineFriends() then spit out a warning rather than failing on the String.Substring().
...
This is to progress http://opensimulator.org/mantis/view.php?id=5789
2011-11-14 16:06:06 +00:00
49ec85ae15
Do a ScenePresence null check in HGMessageTransferModule.SendIMToScene() to stop a NullReferenceException being thrown if an HG IM is sent to a simulator running multiple regions
...
This is an attempt to address http://opensimulator.org/mantis/view.php?id=5791
2011-11-14 15:24:02 +00:00
6daa61d6ba
Merge branch 'master' into bigmerge
2011-11-12 12:36:52 +00:00
efc6c6db7c
Fix taking or returning locked objects losing permissions for owner
2011-11-12 12:09:28 +01:00
5fd1749150
Remove SceneViewer from ScenePresence to reduce quadruple queueing of
...
prim update to only triple queuing. Existing method was:
1. Schedule prim for update, adding to scene update list
2. Update on SOGs during heartbeat queues update onto each SceneViewer
3. Update on SPs during heartbeat queues update onto each IClientAPI
4. ProcessEntityUpdates queues updates into UDP send stack
Now the SceneViewer has been eliminated so updates are scheduled at any
time and then put onto the IClientAPI priority queues immediately during
SceneGraph.UpdateObjectGroups.
2011-11-11 17:16:52 -08:00
e61ea79c72
doh - correct build break
2011-11-12 00:27:43 +00:00
f130e1a86f
Add threads to the watchdog thread list before we start them.
...
Hopefully this wil make "WATCHDOG: Asked to update thread ## which is not being monitored" messages." go away.
2011-11-12 00:24:45 +00:00
25c32061e4
Make log messages on authentication failure more explicit
2011-11-11 23:45:08 +00:00
a4ec97cfdd
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
OpenSim/Services/AuthenticationService/PasswordAuthenticationService.cs
2011-11-11 23:43:18 +00:00
6adaf1be74
extract common ScenePresence setup code into Init() method for ScenePresenceSitTests
2011-11-11 23:36:35 +00:00
84ad23234b
add SP.PhysicsActor checks to other sit/stand tests
2011-11-11 23:33:55 +00:00
acaf6937c5
add sit and stand on ground test
2011-11-11 23:32:43 +00:00
a3052e40ad
extract ground sit code into SP.HandleAgentSitOnGround() for consistency with other sitting code.
2011-11-11 23:28:32 +00:00
6ce3daff94
Pick up the intended ConsolePrompt from [Startup] instead of console_prompt.
...
Addresses http://opensimulator.org/mantis/view.php?id=5786
2011-11-11 23:15:53 +00:00
2a2cdaa211
As with prim sitting avatars, make an avatar phantom when it sits on the ground and solid again when it stands.
...
This is to avoid http://opensimulator.org/mantis/view.php?id=5783 when a collision with a ground sitting avatar causes that avatar to automatically stand and sometimes not be able to move
A better solution may be to keep gound sitting avatars solid but remove their collision status. However, this requires some physics code work.
2011-11-11 23:10:43 +00:00
ce8441132e
Restore sending of OutPacket() for object kills removed in commit c7dd7b1.
...
OutPacket() must be called within the m_killRecord lock. Otherwise the following event sequence is possible
1) LLClientView.ProcessEntityUpdates() passes the kill record check for a particular part suspends before OutPacket()
2) Another thread calls LLClientView.SendKillObject() to delete the same part and modifies the kill record
3) The same thread places the kill packet on the Task queue.
4) The earlier thread resumes and places the update packet on the Task queue after the kill packet.
This results in a ghost part in the sim that only goes away after client relog.
This commit also removes the unnecessary m_entityUpdates.SyncRoot locking in SendKillObject.
2011-11-11 22:37:57 +00:00
2a7f4e0602
remove unncessary IClientAPI parameter from SP.SendSitResponse()
2011-11-11 21:53:00 +00:00
b1cb4f5b04
As per mailing list last week, remove facility that would automatically move the avatar if prim with no sit target was out of sitting range.
...
Now, no movement occurs.
Note that you can still sit on a prim with an explicit sit target from any distance, as was the case before.
2011-11-11 21:42:58 +00:00
a658bddbcd
Bump warp sit distance up to 10 meters, as discussed on opensim-dev mailing list last week.
...
This means that if the avatar is within 10 meters of the selected target, it sits on it immediately without walking.
Existing autopilot outside this range will be disabled in a later commit
2011-11-11 19:59:12 +00:00
8f4955f6a9
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-11 19:40:31 +00:00
dc200d7bb5
Add new ScenePresenceSitTests with a single sit/stand test
2011-11-11 19:38:36 +00:00
10e664eedc
Fix compile error from an earlier commit
2011-11-10 17:37:33 -08:00
7432ca6daf
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-11-10 17:21:49 -08:00
96c59156a7
In SOP, replaced many references to private members with the public properties
2011-11-10 17:21:37 -08:00
a9fbf3a4e0
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2011-11-11 01:19:38 +00:00
a5838cf0a6
Prevent linking objects while they are deeded. On unlinking deeded objects,
...
set LastOwnerID properly so the parts cannot be transferred, circumventing
no trans perms
2011-11-11 00:28:12 +00:00
2bd4eaeb19
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-11-10 23:43:29 +00:00
0daece6f2b
Fix turn left and turn right properly. Works for both built-ins and LSL AOs
2011-11-10 23:42:48 +00:00
8fbaa10ade
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-11-10 15:23:16 -08:00
9359293b11
Cleaned UpdatePermissions calls on SOP and SOG to eliminate redundant properties packet sends and so one part is not telling a different part what to do. That should be up to the SOG to manage permissions on its parts and notify clients when one of them changes.
2011-11-10 15:20:21 -08:00
f5abae5ac6
Implement nudging support for strafing motion
2011-11-10 23:03:05 +00:00
a081df75e2
Prevent linking objects while they are deeded. On unlinking deeded objects,
...
set LastOwnerID properly so the parts cannot be transferred, circumventing
no trans perms
2011-11-10 23:59:13 +01:00
e9055cec17
Merge branch 'master' into bigmerge
2011-11-10 23:44:19 +00:00
c0d280d948
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-10 22:58:24 +00:00
2d4ac6288d
Alter commit 3758306 to allow region name to be substituted within a region console prompt
...
This is to allow broader subsitution in the future. Currently, the only substitions are \R (for region name) and \\ (for a single backslash)
e.g. "Region (\R) " is the current and continuing default prompt
This renames custom_prompt in [Startup] to ConsolePrompt
2011-11-10 22:56:13 +00:00
008b213ec0
Fix turn left and turn right properly. Works for both built-ins and LSL AOs
2011-11-10 23:15:03 +01:00
4939d99b57
Merge branch 'master' into bigmerge
2011-11-10 23:03:50 +00:00
f3fea81936
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-11-10 14:09:53 -08:00
18c625bda6
When updating SOG, a physics taint should not override a full update with a terse update
2011-11-10 14:09:35 -08:00
e7fed80e85
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-11-10 22:35:41 +01:00
81fbe7ffb1
Implement nudging support for strafing motion
2011-11-10 22:34:54 +01:00
b990914ec4
convert tabs from commit 3758306 to spaces
2011-11-10 21:04:12 +00:00
cb7ea68942
Merge branch 'master' into bigmerge
2011-11-10 20:56:44 +00:00
444b345cdf
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-11-10 20:54:44 +00:00
48d2300b8a
Fix misaligned sit animation on scripted sit caused by the default sit
...
animation being run after the scripted one.
2011-11-10 20:54:15 +00:00
9cba179dff
launch pCampbot shutdown console comand asynchronously
2011-11-10 20:03:36 +00:00
f31a58bd99
Remove unused index parameter from BotManager.startupBot(). Rename startupBot() => StartBot()
2011-11-10 19:40:45 +00:00
063920e0a2
Fix misaligned sit animation on scripted sit caused by the default sit
...
animation being run after the scripted one.
2011-11-10 20:26:14 +01:00
a1426739a2
Merge branch 'master' into bigmerge
2011-11-10 17:35:35 +00:00
37583063ee
Allow custom setting for the console prompt
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-11-10 06:56:32 -05:00
4f6915bad5
minor: Correct misleading method doc on SOG.UpdateRootRotation()
2011-11-09 21:49:08 +00:00
bbab7b6b4d
Use IsConnected status to determine whether all pCampBots have disconnected, rather than maintaining a separate count
...
Checking IsConnected is more reliable.
2011-11-09 21:23:23 +00:00
674b521fdd
In pCampBot, don't try and pull down Primitive faces or sculpts set to null
2011-11-09 20:21:48 +00:00
d40d0e4596
Fix the ability to move the seated avatar via LSL
2011-11-08 23:15:09 +01:00
7e488cd635
Remove unused avariable in PollServiceRequestManager
2011-11-07 23:24:13 +00:00
39b967e214
Correct test failure in sit position check of TestSitAndStandWithNoTarget()
...
Curiously, a Vector3.ToString() will not display the last two places of the float. In this case, the failure of
the assertion would confusingly report Expected: <0, 0, 0.8454993> But was: <0, 0, 0.8454993> when actual Z figure is 0.845499337
Should fully address http://opensimulator.org/mantis/view.php?id=5779
2011-11-07 22:53:52 +00:00
adbc69bb07
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
2011-11-07 02:41:56 +00:00
6d92d65140
That such a trivial change can be so difficult to get right. Fix it this time.
2011-11-07 02:40:35 +00:00
e775b3fc47
Fix build break
2011-11-07 02:03:17 +00:00
67780b00f0
Fix up failing test to compensate for changed sit target offset
2011-11-06 21:47:12 +00:00
69322b84ce
Fix up failing test to compensate for changed sit target offset
2011-11-06 21:46:03 +00:00
323b76cee4
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/AsyncSceneObjectGroupDeleter.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-11-06 20:54:13 +00:00
84a61cd00b
Merge branch 'bigmerge' of ssh://melanie@3dhosting.de/var/git/careminster into bigmerge
2011-11-06 20:45:07 +00:00
559e6e52f5
Make the AsyncSceneObjectDeleter send a list of kills. This will make large
...
marquee-selected deletions of single prims or small link sets nearly
instantaneous
2011-11-06 20:43:49 +00:00
c7dd7b13a2
Convert SendKillObject to take a list of uint rather than sending one
...
packet per prim. More to come as we change to make use of this.
2011-11-06 20:38:07 +00:00
51bad0f8ae
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-11-06 20:12:57 +00:00
fa992a020c
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-11-06 20:00:47 +00:00
0bf757e42b
Allow HG and other scene presences not linked to a user account to function.
2011-11-06 20:00:03 +00:00
c9179be1ed
Small preformance tweak
2011-11-06 20:16:24 +01:00
927561383e
HUD attachments: Removes some more messages sent to wrong clients.
2011-11-06 17:43:39 +01:00
dfbfc9826a
Damaged assets, especially appearance textures, could crash the region server with a fatal exception.
...
Now, such excpetions are caught by an exception handler and just an error message is shown.
This was the kind of exception causing these fatal server crashes:
APPLICATION EXCEPTION DETECTED: System.UnhandledExceptionEventArgs^M
^M
Exception: System.ArgumentOutOfRangeException: Argument is out of range.
Parameter name: offset exceeds the size of buffer
at System.Net.Sockets.NetworkStream.BeginRead (System.Byte[] buffer, Int32 offset, Int32 size, System.AsyncCallback callback, System.Object state) [0x00000] in <filename unknown>:0
at HttpServer.HttpClientContext.OnReceive (IAsyncResult ar) [0x00000] in <filename unknown>:0 ^M
^M
Application is terminating: True^M
2011-11-06 15:05:19 +01:00
89a1d7c37c
Break out the parts of ScenePresence that differ from core
2011-11-05 23:37:43 +00:00
bd10d14bbd
Fix build break
2011-11-05 23:12:00 +00:00
57194facdc
Fix up with core changes
2011-11-05 23:06:59 +00:00
facdc9c46e
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-11-05 22:56:08 +00:00
bbbcdaa462
Remove spammy autopilot debug
2011-11-05 22:54:47 +00:00
9bded61ca4
Whitespace fix from core
2011-11-05 22:48:32 +00:00
01b6a4b62e
Remove some left over debug and reverse experimental reordering of ifs
2011-11-05 22:46:45 +00:00
4d3926694d
Remove enableprejump config option and associated code as this is now
...
fully functional and cannot be disabled because that would break timings.
2011-11-05 22:43:45 +00:00
71388fc02a
Porting the ScenePresenceAnimator from Avination. Jump and fall anims now work
...
properly.
2011-11-05 22:41:00 +00:00
5517e21068
Harmonize with core and remove extraneous comments with no information in them
2011-11-05 22:34:36 +00:00
534560df8c
Remove backup optimization that was causing prim contents to poof
2011-11-05 23:31:20 +01:00
8fb6ae379a
Change m_falling public to a getter property.
2011-11-05 22:05:27 +00:00
9c6025f928
Adapt to the core SP rework
2011-11-05 21:53:05 +00:00
ac3254a5f5
Change puvlic m_ variable to a getter property
2011-11-05 21:43:35 +00:00
2dc452b4a7
ScenePresence part of the Avination animator fixes.
2011-11-05 21:41:16 +00:00
b6df9e9fe4
Chnaging the sit target adjustment to a more precise approximation of SL. Some small
...
fixes ported from Avination. Some white space fixes.
2011-11-05 21:24:36 +00:00
0f279b1187
Some more changes to catch up with core
2011-11-05 21:23:25 +00:00
cc8e693fb9
Remove unused and broken OffsetRotation from ScenePresence
2011-11-05 20:39:43 +00:00
506653ff00
Some trivial changes to get closer to core
2011-11-05 20:32:20 +00:00
1a6b2a6429
Change comment formatting to match core for a cleaner diff
2011-11-05 20:17:02 +00:00
bda7b3dffe
Replace our patched up, broken an rebroken sit code with the code from
...
core which has now matured beyond what we had.
2011-11-05 19:28:16 +01:00
03f5bbcaf2
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-11-05 11:17:40 +00:00
2cf6172689
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-11-05 11:05:32 +00:00
e182cc198d
Fix avatar height, removes the hip offset hack
...
Author: Mana Janus <mana@mjm-labs.com>
2011-11-05 02:56:52 -07:00
4797ed6edd
Multiple lines in welcome message use '\n' in the welcome message to
...
start a new line.
2011-11-05 02:42:21 -07:00
e3885625a0
Don't rotate child prims, if only the root prim is rotated.
2011-11-05 02:26:25 -07:00
cfce2529ad
refactor: In sit code, compare against Vector3.Zero and Quaternion.Identity instead of individual components of a vector/quat
2011-11-05 02:04:48 +00:00
8105794121
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-05 01:42:20 +00:00
28c4dc9be4
Fix NPC sitting for prims without a sit target.
...
This is to partially address http://opensimulator.org/mantis/view.php?id=5769
We don't need to call SP.HandleAgentSit() again if we are within 10m since the autopilot won't trigger.
By calling it twice, the position of the sitting NPC was wrongly adjusted, ending up near <0,0,0>.
However, this change does mean that NPCs further than 10m away will not attempt to autopilot to the prim, though this code was broken anyway (is actually a different mechanism to normal NPC movmeent).
Hopefully this can be addressed soon.
2011-11-05 01:38:42 +00:00
b199aad037
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-11-05 00:11:10 +00:00
c803ed28c3
Replacing te linking code with the code from Avination. Link sets prims are now
...
numbered properly even when sets are linked to sets.
2011-11-05 00:09:37 +00:00
f7b8c54c24
Add comment for experimental effect of removing the Thread.Sleep(20) in ODEPrim.changevelocity()
2011-11-04 23:43:17 +00:00
d7815ace4a
On standup, trigger the changed link script event after the avatar has been fully changed.
...
This was meant to help with the script in http://opensimulator.org/mantis/view.php?id=5772 but it doesn't work.
Probably the event is fired before the physics actor has been set up again for the stood avatar.
Fixing that would be much more complicated, but processing the event last of all seems like a good idea in any case.
2011-11-04 23:24:22 +00:00
b9f7aebde3
Merge branch 'master' into bigmerge
2011-11-04 23:21:19 +00:00
ccca6ba935
Stop llPushObject() from causing problems by adding force via a taint rather than directly.
...
This isn't a perfect solution since there can be a race between the taint processing and taint setting, as force needs to be reset after processing.
Needs careful locking in the future.
2011-11-04 23:12:01 +00:00
24235006f4
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/LightShare/LightShareModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
2011-11-04 01:18:37 +00:00
b8d50b10fb
Rename ForEachAvatar back to ForEachScenePresence. The other changes
...
from previous commit which sort out which iterator is used are left
intact. A discussion is needed as to what constitutes an avatar vs a
ScenePresence.
2011-11-03 17:53:51 -07:00
94dc7d07eb
Renamed ForEachRootScenePresence to ForEachAvatar. Cleaned up calls to
...
the 3 iteration functions so more of them are using the correct
iteration for the action they are performing. The 3 iterators that seem
to fit all actions within OpenSim at this time are:
ForEachAvatar: Perform an action on all avatars (root presences)
ForEachClient: Perform an action on all clients (root or child clients)
ForEachRootClient: Perform an action on all clients that have an avatar
There are still a dozen places or so calling the old
ForEachScenePresence that will take a little more refactoring to
eliminate.
2011-11-03 17:06:08 -07:00
69a4057135
remove the pointless check of the face texture struct against null in Bot.Objects_NewPrim()
2011-11-03 22:52:14 +00:00
e4bdf1e78f
actually remove the sleep from PhysicsBehaviour that I shifted to Bot a couple of commits ago
2011-11-03 22:50:40 +00:00
f26fdbd8da
Rename PhysicsBot => Bot since it doesn't just exercise physics anymore
2011-11-03 22:39:06 +00:00
ca2c25ece2
Move one of the old physics sleeps out into the main bot loop, so leaving out PhysicsBehaviour doesn't result in continuous other behaviours
2011-11-03 22:35:21 +00:00
5a67940acc
Add click/grab behaviour to pCampbot, which gets bots to randomly click things.
...
This can be specified on pCampbot.exe by using g in the list of behaviours for the new -behaviours,-b switch
e.g. -b p,g to get both existing physics and grabbing behaviours.
grabbing is primitive, it attempts grabs on random prims whether they're actually signalled as clickable or not.
behaviour is currently primitive overall, behaviours are just executed in a list
2011-11-03 22:31:31 +00:00
3ea379e4cd
Move PhysicsBehaviour into a spearate behaviours folder
2011-11-03 21:25:27 +00:00
66c60c56a0
Separate out physics testing actions into a separate PhysicsBehaviour class
2011-11-03 21:16:24 +00:00
a62ccb5c4c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-03 20:12:10 +00:00
40a1eddfd1
Drop the CopyTo parameter from Int32.MaxValue to 4096. This is a buffer size
...
not a target size. Mono 2.10 appears to try to allocate the full buffer which
immediately crashes. Tested on mono 2.6.7 and 2.10.5
2011-11-02 18:55:54 -07:00
457195466d
Merge branch 'master' into bigmerge
2011-11-03 00:23:58 +00:00
6b4ae4f30c
Revert "fix CopyTo call that was breaking under mono 2.10"
...
This reverts commit d30971fdc2
2011-11-03 00:23:32 +00:00
99a347ee11
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-02 17:11:10 -07:00
d30971fdc2
fix CopyTo call that was breaking under mono 2.10
2011-11-02 17:10:59 -07:00
e746840226
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2011-11-02 23:51:48 +00:00
08fcf958c2
Port the Avination offline messaging system to Core
2011-11-02 23:50:47 +00:00
26a4f32013
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-11-02 23:42:37 +01:00
afde92d8cc
Merge branch 'master' into bigmerge
2011-11-03 00:07:29 +00:00
243acef917
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-11-03 00:06:14 +00:00
ce8419fdd0
Fix link order when linking sets to sets
2011-11-02 23:42:09 +01:00
a724ebacd7
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-11-02 14:59:34 -07:00
e2c51a977d
Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.
...
UpdateFlag is now referenced/used only within SOP and SOG. Outsiders are
using ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule on
SOP consistently now. Also started working toward eliminating those
calls to ScheduleFullUpdate, ScheduleTerseUpdate or ClearUpdateSchedule
from outside SOP in favor of just setting properties on SOP and let SOP
decide if an update should be scheduled. This consolidates the update
policy within SOP and the client rather than everywhere that makes
changes to SOP. Some places forget to call update while others call it
multiple times, "just to be sure".
UpdateFlag and Schedule*Update will both be made private shortly.
UpdateFlag is intended to be transient and internal to SOP so it has
been removed from XML serializer for SOPs.
2011-11-02 14:59:00 -07:00
59232a6ea8
Change default say distance to 20m from 30m, the same as on the big grid. This is to improve the migration of scripts that expect a 20m say distance.
...
If you want to keep a 30m say distance then please set this as the say_distance parameter in the [Chat] section of OpenSim.ini.
2011-11-02 20:05:31 +00:00
72923134e9
Get some hopefully more useful exception information when OpenJPEG.EncodeFromImage() fails in VectorRender and DynamicTexture modules
2011-11-02 18:40:49 +00:00
03993d0b14
Fix race condition that would sometimes send or save appearance for the wrong avatar.
...
In AvatarFactoryModule.HandleAppearanceUpdateTimer(), we loop through appearance save and send requests and dispatch via a FireAndForget thread.
If there was more than one request in the save or send queue, then this led to a subtle race condition where the foreach loop would load in the next KeyValuePair before the thread was dispatched.
This gave the thread the wrong avatar ID, leaving some avatar appearance cloudy since appearance data was never sent.
This change loads the fields into local references so that this doesn't happen.
2011-11-02 18:25:03 +00:00
b6873a7b5d
Catch any exceptions exiting the top of the robust console, as we already do for the main simulator.
...
This prevents issues such as transient mono console problems from crashing the server.
2011-11-02 13:16:02 +00:00
afae9eafbe
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-11-02 12:34:57 +00:00
c5fb39e21f
Restore the recursive calling of PRIM_LINK_TARGET because the version I made
...
breaks LINK_SET et al.
2011-11-02 12:09:18 +00:00
1b9ae3fb51
Some positioning fixes from AVN trunk
2011-11-02 12:02:44 +00:00
c55e161dc4
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-11-02 11:49:25 +00:00
b9e700b60d
Streamline PRIM_LINK_TARGET, eliminating a recursion and a failure scenario
2011-11-02 11:43:16 +00:00
7c8bfac11b
Removed redundant SceneContents property from Scene. It's the same as SceneGraph property.
2011-11-01 17:20:12 -07:00
3bead3eb50
Part 2 of see_into_this_sim_from_neighbor configuration option removal
2011-11-01 17:11:43 -07:00
9a8715ec9a
Merge branch 'master' into bigmerge
2011-11-02 00:07:59 +00:00
b69f679122
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
2011-11-01 23:54:09 +00:00
4b58d4ff95
Removed see_into_this_sim_from_neighbor configuration option.
2011-11-01 16:51:14 -07:00
9456a540c5
Add "appearance send" command to allow manual sending of appearance.
2011-11-01 23:23:45 +00:00
8e2e4c47d9
Add "show status" command to pCambot
2011-11-01 22:09:21 +00:00
40750b44a0
Listen only for non SimShutdown Network.Disconnect firing so that we don't quite the program before all bots have actually logged off.
2011-11-01 21:47:14 +00:00
53f3b76a84
get rid of unused m_verbose field
2011-11-01 21:18:28 +00:00
12bd0ebd34
stop recording the threads on which we happen to start bots. These are pointless since they terminate quickly
2011-11-01 21:15:47 +00:00
9ef5107157
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-11-01 21:02:03 +00:00
87ec8a4ecb
Retain a reference to an action thread rather than starting an infinite loop via a timer, so that we can actually abort the action thread on shutdown
2011-11-01 18:36:29 +00:00
9d214d4903
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-10-31 16:42:50 -07:00
3c55f3015f
Removed unused show commands from Scene.cs and SceneBase.cs. The show modules command in OpenSim.cs now shows both shared modules and region modules.
2011-10-31 16:42:28 -07:00
b951c7fb1e
Make bots share a cache so that asset downloads attempts are only made once instead of once for each bot
2011-10-31 23:22:55 +00:00
210868a832
Remove OpenSim.TestSuite
...
Hasn't been touched since 2009 and wasn't more than another copy of pCampBot
2011-10-31 23:10:10 +00:00
d366a08ebb
Stop individual bots attempting to download the same asset more than once
2011-10-31 22:52:49 +00:00
0c6509098a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-31 22:27:35 +00:00
43e07efbc8
Fix bot disconnection
2011-10-31 22:27:12 +00:00
3a2dcc7298
Merge branch 'master' of git://opensimulator.org/git/opensim
2011-10-31 15:21:39 -07:00
d3153f47fa
Adding green dots to map response should be for root agents only
2011-10-31 15:20:57 -07:00
b1647f6d04
adjust pCampbot so it starts up bots with the name format "<firstname> <lastname>_<bot-number>"
...
e.g. starting up two bots called "Ima Bot" will give them the names "Ima Bot_0" and "Ima Bot_1"
This is necessary since bots with random names can no longer be created, as there's no easy way to turn off account authentication
2011-10-31 22:14:49 +00:00
e3f51df3c2
Stop pCampbot from firing connected event twice, which results in double counting.
2011-10-31 21:33:25 +00:00
a9a24062a5
Plug a security hole in the inventory service
2011-10-31 11:11:36 +00:00
4002e205cb
Merge branch 'master' into bigmerge
2011-10-31 10:53:17 +00:00
e431d5dae4
Plug a security hole in the inventory service
2011-10-31 10:18:25 +01:00
14646f2524
Fix line endings
2011-10-30 23:43:17 -07:00
a85ff884d9
Experimental reorder of Heartbeat loop now simulates physics and sends updates to clients prior to sleep. Existing behavior was to sleep BEFORE sending updates. We found this patch reduced latency to clients by 1-2 heartbeat periods.
2011-10-30 23:39:39 -07:00
083b28de8c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2011-10-30 10:16:25 +00:00
6d97545b6b
Remove the SyncRoot locking from Scene which was only being done around the main physics loop and ScenePresence position and velocity setting
...
This is no longer necessary with ODECharacter taints (ODEPrim was already not taking part in this). BSCharacter was already tainting.
2011-10-29 02:42:53 +01:00
9fdd1753fa
Add taint target velocity for ODECharacters as is already done for ODECharacter position and position and velocity for ODEPrims.
...
This is to help stop surprises if the velocity is set in the middle of physics calculations, though this probably isn't a huge problem.
It's more for consistency and for the next step of removing some scene locks
2011-10-29 02:30:33 +01:00
ef8370fb8e
tidy up OdeCharacter so that we just use OpenMetaverse.Vector3 assignment directly where possible, instead of transferring X, Y and Z components separately
...
some of this is probably a hold over from using ODE.Vector3, which is still necessary in some places.
2011-10-29 02:07:28 +01:00
a5ea9f8830
Move position set from taint to logically better position at top of ODECharacter.ProcessTaints() though this makes no practical difference
2011-10-29 01:46:22 +01:00
5ae8de3c00
Stop setting _position as well as m_taint_position in ODECharacter.Position
...
setting position at the same time as taint appears to undermine the whole purpose of taint
testing doesn't reveal any obvious regressions in doing this
2011-10-29 01:39:48 +01:00
61e97ee4c8
Remove completely unused SOG.Rotation parameter
...
We always use SOP.Rotation instead
2011-10-29 00:39:01 +01:00
c2da1c4580
set grp.RootPart.GroupPosition for code consistency (and readability) rather than calling SOP.OffsetForNewRegion
2011-10-28 23:43:31 +01:00
9bf8c3e7b7
Add missing doc to rotation/position methods in SOG
2011-10-28 23:38:57 +01:00
0fe756e42c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-28 23:16:46 +01:00
7b46506822
fetch SOP.RotationOffset once in UpdateRotation() and compare rather than fetch four separate times.
...
No functional change.
2011-10-28 23:15:51 +01:00
175d74e68c
Fix the offline message module to revert core changes and restore avn
...
specific behavior
2011-10-28 23:10:54 +02:00
9b6ce41b0e
Reduce severity and remove duplication if a common log message regarding
...
baked textures
2011-10-28 23:10:22 +02:00
955144584d
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-10-27 17:45:51 +02:00
b975cbcbed
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/Avatar/InstantMessage/MessageTransferModule.cs
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-10-27 18:14:38 +01:00
272bf71279
Removed use of 'is' operator and casting to find the root ScenePresence in MessageTransfer modules and Groups module.
2011-10-27 02:26:37 -07:00
06577d7299
Continuation of previous checkin. Found more places where ForEachScenePresence can be changed to ForEachRootScenePresence.
2011-10-27 01:25:12 -07:00
b98613091c
Added new ForEachRootScenePresence to Scene since almost every delegate passed to ForEachScenePresence checks for !IsChildAgent first. It consolidates child and root handling for coming refactors.
2011-10-27 00:42:21 -07:00
40bee97015
For now, comment out error message on new script engine console commands.
...
This causes false positives if a simulator has more than 1 region and the current region is 'root' since this sends the command separately to each region and each region has its own XEngine
2011-10-27 03:01:27 +01:00
76c50d23f2
Comment out inventory folder bulk update code on InventoryAccepted message introduced in commit db91044 on Aug 22 2011
...
This should be unecessary since the folder update is already made at the time of the offer (and moved to trash if not accepted).
This code was also not taking into account the situation where an item was accepted.
Needs more fixing if this results in an aggression elsewhere.
2011-10-27 02:56:08 +01:00
e210d95821
Don't blow our brains out if LLClientView.BulkInventoryUpdate() is wrongly passed a null node reference.
...
Addresses worst aspect of http://opensimulator.org/mantis/view.php?id=5752
2011-10-27 02:50:58 +01:00
2db6a8ce8f
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-10-27 02:06:59 +01:00
820242bc49
Fix a bug I introduced yesterday in ODE physics where prim scripts would only receive the very first collision.
2011-10-27 02:05:59 +01:00
6a96c9546d
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2011-10-26 17:48:51 +01:00
c763419043
Merge branch 'bigmerge' of ssh://3dhosting.de/var/git/careminster into bigmerge
2011-10-26 17:55:53 +02:00
41395d5443
Added optional owner classes to existing OSSL agent Permissions
...
PARCEL_GROUP, PARCEL_OWNER, ESTATE_MANAGER and REGION_OWNER can be combined with the existing agent uuid option to limit ossl functions to agents and owner classes.
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-10-26 10:35:50 -04:00
9a28e7a4e0
Implementation of PRIM_OMEGA, but only for setting
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-10-26 08:41:07 -04:00
059f4b6a3a
Implementing PRIM_LINK_TARGET, but only for setting params
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2011-10-26 07:47:44 -04:00
fd22159d0c
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Framework/Watchdog.cs
2011-10-26 01:27:24 +01:00
c275c22928
Restart the event queue worker threads that I accidentally disabled earlier today in 8a0a78c.
...
Also adds these to the watchdogs with very large timeouts (should really be infinite)
2011-10-25 23:26:21 +01:00
182908d216
In Watchdog, add ability to specific timeout for a thread.
...
This also changes the point of registration to the StartThread() call rather than the first Update()
2011-10-25 23:16:01 +01:00
e549f2f443
Add m_threads dictionary locking to Watchdog.GetThreads()
2011-10-25 22:51:23 +01:00
6a74a4c12b
Clear OdeCharacter CollisionEventUpdate when we subscribe or unsubscribe from collision events
2011-10-25 22:46:42 +01:00
0f83f87233
Remove unused fields from CollisionEventUpdate
2011-10-25 22:39:08 +01:00
c825c9a945
Get rid of the pointless null checks on collision listeners. Add warning about synchronicity for PhysicsActor.OnCollisionUpdate event doc
2011-10-25 22:35:00 +01:00
b9f106f484
When sending object collision updates, don't null out and recreate the CollisionEventUpdate() if the number of collisions falls to zero. Reuse the existing one instead.
2011-10-25 22:28:40 +01:00
5d37f0471e
For ScenePresence collision events, instead of creating a new CollisionEventsThisFrame every time we need to send some new ones, reuse the existing one instead.
...
This assumes that the listener is using the data synchronously, which is currently the case.
2011-10-25 22:19:17 +01:00
7b6b36cee9
Fix bug where collision event listeners were not removed once the listener had gone away.
...
This was causing continuous use of temporary memory even when all avatars had left the scene.
Memory does leak but it does cause more calls to the garbage collector, which would pause the scene thread for a very short while during collection.
2011-10-25 21:40:51 +01:00
1fbb379536
minor: rename a parameter in OdeScene.Simulate() from actor -> prim since it's an OdePrim
2011-10-25 21:15:37 +01:00
a4d4f54848
minor: add "threads show" as synonym for "show threads" for consistency
2011-10-25 20:59:27 +01:00
968cae6c17
Add "threads abort <thread-id>" simulator console command that allows us to abort a watchdog managed thread.
...
This is for diagnostic purposes.
2011-10-25 20:49:46 +01:00
8a0a78cbcc
Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead of the other way around.
...
This is necessary so that code in HttpServer can use framework facilities such as the thread watchdog for monitoring purposes.
Doing this shuffle meant that MainServer was moved into OpenSim/Framework/Servers
Also had to make OpenSim.Framework.Console rely on OpenSim.Framework rather than the other way around since it in turn relies on HttpServer
MainConsole and some new interfaces had to be moved into OpenSim/Framework to allow this. This can be reverted if parts of OpenSim.Framework stop relying on console presence (cheifly RegionInfo)
2011-10-25 20:24:21 +01:00
27aca49a1f
Merge commit 'e14cb45b9bc4c78300cb804833cb66c1c2e62187' into bigmerge
2011-10-25 03:26:51 +01:00
c8dfef1583
Merge commit '9ec672c70b28b8c1d6d81bab7744fcf7bf9b83c7' into bigmerge
2011-10-25 03:26:44 +01:00
a055dd39ac
Merge commit '79d5bc9beb445ca07cff9ecbd91d89b2a57e14da' into bigmerge
2011-10-25 03:26:34 +01:00
740077a291
Merge commit 'e28e2d24c714c3fba1cba60097986a1c1c28c6c0' into bigmerge
2011-10-25 03:26:20 +01:00
4e9457ca0c
Merge commit '4c9400e6460a73baa2d687afe73a62c6efca9f37' into bigmerge
...
Conflicts:
OpenSim/Services/AuthenticationService/AuthenticationServiceBase.cs
2011-10-25 03:26:09 +01:00
e94574196f
Merge commit 'b868328d519cfb3db597f684fd1f947912fc2222' into bigmerge
2011-10-25 03:19:55 +01:00
271c798813
Merge commit 'c2272a755fc6d3b07bc9b87bd9b83f4ae063ce9f' into bigmerge
2011-10-25 03:19:49 +01:00
84ea10a78c
Merge commit '3fc47275cff5f74e370a24f63f42a6bee023ee17' into bigmerge
2011-10-25 03:19:35 +01:00
02f0aa592d
Merge commit 'ffdf59a57c936189e3b161b79b4a76a3a9b260bb' into bigmerge
2011-10-25 03:19:10 +01:00
8639b037e1
Merge commit '30320505fa54640baf4ecaff8bb743f62ef01f86' into bigmerge
2011-10-25 03:18:59 +01:00
de8cdbda15
Merge commit 'bc2da4eaadb0dbf8502d95fc2e40b1fdcc86e218' into bigmerge
2011-10-25 03:18:53 +01:00
be2cfeb5c3
Merge commit 'c4f8da735914f9a9b1fb99f05313ba0537b528b9' into bigmerge
2011-10-25 03:18:49 +01:00
da805d0cce
Merge commit '5d7eaedbebd408d948321dc474927fc72d3d98c5' into bigmerge
2011-10-25 03:18:38 +01:00
56f3da7b5a
Merge commit '9b3bbedeea5c6ea2421b36e5f0e23ab798870ba0' into bigmerge
2011-10-25 03:18:29 +01:00
1ae36695ba
Merge commit 'a1f05a289dd845edb7e3d163b84ceecc85374427' into bigmerge
2011-10-25 03:18:23 +01:00
0531b73695
Merge commit '4241ee5dfab99d4e247624a2f368a8a931d2e54c' into bigmerge
2011-10-25 03:18:10 +01:00
564563d273
Merge commit '30fe66d3ab534422407415817b570a66096c543b' into bigmerge
2011-10-25 03:18:04 +01:00
6d4480c1ca
Merge commit '9c430208769ab7fd7877093e278e8fcae02ecef3' into bigmerge
2011-10-25 03:17:59 +01:00
3d0d84aff7
Merge commit '6837e44d0707e501795df2d690c6005f5ba1d591' into bigmerge
2011-10-25 03:17:45 +01:00
e35835602f
Merge commit 'b63ec987b0a1692da4c5e84facf0ea149d4cfe90' into bigmerge
2011-10-25 03:17:40 +01:00
e058b0822f
Merge commit 'f16d125027aba098e45dc026f9d507a430bc2b10' into bigmerge
2011-10-25 03:17:26 +01:00
bfc0c96379
Merge commit '9ab2943abf5f890a53dc8ada48bf63ed15331c07' into bigmerge
2011-10-25 03:17:18 +01:00
d1028b3647
Merge commit 'eac29396d98a4864923a69e0eb73cecdd8a225b3' into bigmerge
2011-10-25 03:17:11 +01:00
04678836c3
Merge commit 'da794f34a56f7c88904315ae538de8f3790e6891' into bigmerge
2011-10-25 03:16:47 +01:00
635b1bf18e
Merge commit '601dabb1b73a894e4f2f61abe6e9053d380008cd' into bigmerge
2011-10-25 03:16:40 +01:00
85d40ce1d1
Merge commit '5607fd3af828846291de3358067bb1214619489e' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 03:16:26 +01:00
df430d572d
Merge commit '3cf7fb4eca2ad57835311e8098868f2571709392' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 03:10:54 +01:00
1bb0e3c800
Merge commit 'b45219065c7a81b3ec488b3a6734773c34268618' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2011-10-25 03:07:25 +01:00
1ec82bb000
Merge commit '116fbe8258e336be3f6ac1e11119214629799faa' into bigmerge
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2011-10-25 03:06:18 +01:00
89e973805d
Merge commit 'ecad9f9fd589f90d1c7a20faf14af0304804b616' into bigmerge
2011-10-25 02:57:01 +01:00
a71c60ee6d
Merge commit 'd9184eceab5ff9087801b0f0d447dec2f5227a50' into bigmerge
2011-10-25 02:56:56 +01:00
b6881187d0
Merge commit 'fe484ab331871e1419ee78afefca7c8856e2dfb4' into bigmerge
2011-10-25 02:56:45 +01:00
752b744105
Merge commit '178b8d0926a53d82f54d60c088f36c7bad13dc87' into bigmerge
2011-10-25 02:56:40 +01:00
1b87a0c229
Merge commit '4cffdf15ba320b71650ade9edddec2286b1c5258' into bigmerge
2011-10-25 02:56:30 +01:00
3555987fe9
Merge commit '9f171041c950d55d86481cdcee7a04c623bea8b2' into bigmerge
2011-10-25 02:56:22 +01:00
e1ff72209f
Merge commit '97c66f8eac648229b55ba5a000d57e4b9377c663' into bigmerge
2011-10-25 02:56:15 +01:00
Justin Clark-Casey (justincc)