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
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
cbaf59e086
** TEST ** put back corrected SetPrimParams for avatars, referenced to
...
sitpart and not m_host.
2012-07-16 01:47:50 +01:00
3149eca68f
backkick git
2012-07-15 23:45:47 +01:00
cdd03acffa
just a kick git
2012-07-15 23:37:31 +01:00
15a1ad393c
Merge branch 'avination' into ubitwork
2012-07-15 23:33:06 +01:00
0baa1b557a
Merge branch 'avination' into ubitwork
2012-07-15 23:00:28 +01: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
Justin Clark-Casey (justincc)