df866fd300
Merge branch 'avination' into careminster
2012-07-20 09:35:22 +01:00
7da744566d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-07-20 09:31:06 +01:00
be39f03caa
minor: switch around mixed up circuit code and endpoint data in "show connections" region console command
2012-07-19 23:35:56 +01:00
d1d331a4c0
Make LLClientView instant message handling asynchronous rather than synchronous to prevent long operations from holding up all inbound packet processing.
...
Giving a large folder from one avatar to another was causing a long delay when handled synchronously, since it took some time to retrieve the necessary data from the inventory service.
Handling this asynchronously instead stops this delay from disrupting all avatars in the scene. This has been shown in OSGrid.
I see no reason for not handling all IM messages asynchronously, just as incoming chat is handled asynchronously, so this has been switched for all instant messages.
Thanks to Nebadon for testing this change out.
2012-07-19 23:20:03 +01:00
c4533e755b
Comment out OnIncomingInstantMessage and OnInstantMessage handlers in GroupsModule, since these led to a private blank method
2012-07-19 23:13:08 +01:00
e94831ddab
Stop explicitly closing and nulling out Animator in order to prevent NREs in various places due to race conditions.
...
Even where checks are being made they aren't enough since they all assume that the Animator they just checked is still there in the next line, which is not necessarily the case without locking.
The memory used is small and these should be GC'd anyway when the SP is released. If this is not happening then the wider problem of old SPs being retained needs to be resolved.
2012-07-19 22:59:28 +01:00
ccc7e75ce4
minor: remove some mono compiler warnings
2012-07-19 22:37:48 +01:00
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
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
0797736fba
Merge branch 'ubitwork' into avination
2012-07-17 10:25:13 +02:00
5874dfd342
fix PollServiceRequestManager
2012-07-17 09:47:20 +01: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
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
cd0bf93e71
Merge branch 'avination' into ubitwork
2012-07-17 02:18:16 +01:00
2b2dbec176
Merge branch 'avination' into ubitwork
2012-07-17 01:40:27 +01: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
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
Melanie