UbitUmarov
5874dfd342
fix PollServiceRequestManager
2012-07-17 09:47:20 +01:00
Melanie
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
UbitUmarov
1ff498266c
minor changes, removed extra parts physics updates on linking nonroot
...
prims
2012-07-17 05:25:34 +01:00
UbitUmarov
f004db6572
fix our stats ( old schema )
2012-07-17 03:45:16 +01:00
UbitUmarov
cd0bf93e71
Merge branch 'avination' into ubitwork
2012-07-17 02:18:16 +01:00
UbitUmarov
2b2dbec176
Merge branch 'avination' into ubitwork
2012-07-17 01:40:27 +01:00
UbitUmarov
d5f4fb7b50
Merge branch 'avination' into ubitwork
2012-07-17 00:54:23 +01:00
Melanie
130668057f
Fix merge artefacts
2012-07-17 01:42:42 +02:00
UbitUmarov
0d3661fb5f
UbitOde: remove useless water collider from active code.
2012-07-17 00:27:01 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
b0facd147a
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-07-17 00:02:45 +01:00
Justin Clark-Casey (justincc)
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
Melanie
8204976fb4
Merge branch 'master' into careminster
2012-07-16 23:34:52 +01:00
Melanie
2a85372169
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2012-07-16 23:33:33 +01:00
Melanie
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
Justin Clark-Casey (justincc)
c1667d39a6
refactor: factor out common code in WebStatsModule.OnMakeRootAgent()
2012-07-16 23:15:02 +01:00
Justin Clark-Casey (justincc)
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
Justin Clark-Casey (justincc)
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
UbitUmarov
40c6aef2e5
Merge branch 'avination' into ubitwork
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-16 22:30:54 +01:00
Melanie
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
Melanie
9e99d2036c
Merge branch 'master' into careminster
2012-07-16 21:33:16 +01:00
SignpostMarv
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
Melanie
7b9c4d2826
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-16 21:32:10 +01:00
Melanie
12049e1120
Allow setting linked avatar positions from within a prim not the one sat on
2012-07-16 11:03:12 +02:00
UbitUmarov
cbaf59e086
** TEST ** put back corrected SetPrimParams for avatars, referenced to
...
sitpart and not m_host.
2012-07-16 01:47:50 +01:00
UbitUmarov
3149eca68f
backkick git
2012-07-15 23:45:47 +01:00
UbitUmarov
cdd03acffa
just a kick git
2012-07-15 23:37:31 +01:00
UbitUmarov
15a1ad393c
Merge branch 'avination' into ubitwork
2012-07-15 23:33:06 +01:00
UbitUmarov
0baa1b557a
Merge branch 'avination' into ubitwork
2012-07-15 23:00:28 +01:00
UbitUmarov
2606484e45
Merge branch 'avination' into ubitwork
2012-07-15 22:53:05 +01:00
Melanie
668723fab3
Remove instrumentation and fix the message delivery issue
2012-07-15 23:01:58 +02:00
UbitUmarov
59b6473472
Merge branch 'avination' into ubitwork
2012-07-15 21:32:10 +01:00
Melanie
b130dcea21
Testing changes and instrumentation
2012-07-15 22:28:47 +02:00
UbitUmarov
5f991d92c7
Merge branch 'avination' into ubitwork
2012-07-15 21:20:26 +01:00
Melanie
283df0610d
Save packets received while the client is added and replay them later.
2012-07-15 21:45:06 +02:00
Melanie
8baf4dcc78
Reinstate older set rotation code for avatars since it works in all cases
2012-07-15 20:55:54 +02:00
Melanie
a2d19b9703
Replace sit position and rotation code with older, working version
2012-07-15 20:48:47 +02:00
Melanie
ec40c54509
Revert "Fix a sit rotation issue"
...
This reverts commit 47f7cc9457
.
2012-07-15 20:48:32 +02:00
Melanie
47f7cc9457
Fix a sit rotation issue
2012-07-15 20:41:10 +02:00
Melanie
8b4f7604e6
Revert "Experimentally handle UseCircuitCode synchrnonously"
...
This reverts commit e3fa73da96
.
2012-07-15 19:45:08 +02:00
UbitUmarov
1dc064981b
Merge branch 'avination' into ubitwork
2012-07-15 17:57:48 +01:00
Melanie
e3fa73da96
Experimentally handle UseCircuitCode synchrnonously
2012-07-15 17:17:59 +02:00
UbitUmarov
35a5a064b0
Merge branch 'avination' into ubitwork
2012-07-15 15:40:23 +01:00
Melanie
ad75a4b50b
Eliminate a spurious exception report when a https url is accessed with a wrong
...
CN
2012-07-15 12:28:58 +02:00
Melanie
07b7301c22
Make https work in the poll service manager
2012-07-15 11:21:01 +02:00
Melanie
6f7b5ef4cb
Fix a double parenthesis typo
2012-07-15 02:24:01 +02:00
UbitUmarov
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
Melanie
caef55a636
Set up https to work like http does in the poll handler
2012-07-15 01:05:04 +02:00
UbitUmarov
a492b6f693
remove forgotten line...
2012-07-14 20:13:40 +01:00
UbitUmarov
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