1598f9d179
Fix the order of operations on detach. The object must always be serialized
...
while still in the scene to avoid losing important script state.
DeleteSceneObject can not be called before doing this!
2012-07-20 16:45:24 +02: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
4917637ce6
Fix llSameGroup to work according to specs
2012-07-18 14:30:40 +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
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
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
Melanie