f6e1f7a4af
Merge branch 'master' into careminster
2012-10-18 21:24:38 +01:00
a2c93133be
Remove extraneous calls to the now commented CheckSculptAndLoad
2012-10-18 21:23:57 +01:00
afab5f5cd1
extend coment to include all unused SOG CheckSculptAndLoad()
2012-10-18 21:13:25 +01:00
7ab83f9eb2
[DANGER UNTESTED] ODE mesh assets. Other plugins will not do meshs/sculpts
...
now
Signed-off-by: Melanie <melanie@t-data.com>
2012-10-18 21:13:02 +01:00
de44e93aa2
missing changed file
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-10-18 20:58:34 +01:00
1e7fb2dc36
i update core ode plugin and make it load is meshs (i hope)
...
Signed-off-by: Melanie <melanie@t-data.com>
2012-10-18 20:58:12 +01:00
72c925a6c9
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/Physics/OdePlugin/OdeScene.cs
2012-10-18 20:56:34 +01:00
caf2dcde70
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
2012-10-18 20:42:43 +01:00
2e8e8d576e
Remove redundant and annoyingly modal message box in upload processing.
2012-10-18 13:20:50 +02:00
991151250d
If we're avoiding printing a long request warning for a GetTexture CAP call, check we received a request handler first since this is not guaranteed.
...
Resolves harmless logged exception when content type and generic xml rpc requests take more than 3 seconds.
2012-10-18 00:39:43 +01:00
0811f3d28d
minor: Remove event method doc from LLClientView that I forgot in the last commit (1de80c)
2012-10-18 00:34:10 +01:00
3651cc0378
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2012-10-18 00:06:43 +01:00
1de80cdafe
minor: move recent OnAgentUpdate/OnPreAgentUpdate event doc up into IClientAPI from LLClientView
2012-10-18 00:04:23 +01:00
3ec2923022
Reuse the same AgentUpdateArgs object for each AgentUpdate UDP packet (of which there are 10 a second) rather than constructing a new one every time.
...
We can do this because AgentUpdate packets are handled synchronously.
2012-10-17 23:54:05 +01:00
9b68446811
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-10-17 23:50:48 +01:00
faf6b56839
Explicitly return only the incoming AgentUpdate packet as this is the only one we pool atm, rather than attempting to return all incoming packets.
2012-10-17 23:08:14 +01:00
2ed59ad8ac
If RecycleBaseUDPPackets = true, also pool IncomingPackets to reduce memory churn
2012-10-17 21:08:15 +01:00
0ca9666932
Merge branch 'ubitwork' into avination
2012-10-17 20:46:38 +02:00
322eefbb6f
Allow the console to be used by gods as well as region owners.
2012-10-17 01:31:05 +02:00
416bc19da7
Merge branch 'avination' into careminster
2012-10-17 00:13:49 +01:00
39cbf4f7a1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
2012-10-17 00:12:30 +01:00
ad60a29c93
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
2012-10-17 00:03:02 +01:00
f35826eb31
minor: Make BasicCircuitTests.SetUp() call overriden base method instead of ignoring it.
2012-10-16 23:50:45 +01:00
4e5b2346a5
Add LastMemoryChurn stat using existing data so we can more quickly tell how memory churn changes rather than waiting for the average to move.
2012-10-16 23:44:52 +01:00
fc861c7904
Add optional pool for the UDPPacketBuffer objects that handle all incoming UDP data.
...
Even when an avatar is standing still, it's sending in a constant stream of AgentUpdate packets that the client creates new UDPPacketBuffer objects to handle.
This option pools those objects. This reduces memory churn.
Currently off by default. Works but the scope can be expanded.
2012-10-16 23:35:05 +01:00
c4fcfec24e
Merge branch 'master' into careminster
2012-10-16 23:22:37 +01:00
db4ca57590
Make it possible to separate start and stop lludp packet processing from the console for debug processes.
...
This is controlled via the "debug lludp start <in|out|all>" and "debug lludp stop <in|out|all>" region console commands.
The command "debug lludp status" will show current status.
2012-10-16 21:55:00 +01:00
e8936366f5
coment a debug warning
2012-10-16 11:39:58 +01:00
91b83fd45e
fixes
2012-10-16 11:26:05 +01:00
fa52effb27
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
2012-10-16 04:30:01 +01:00
8459b98f68
minor: Comment out log message on every FRIENDS SIM CONNECTOR request for now.
2012-10-16 01:40:25 +01:00
ab0294f010
Add missing category paremeter to llGiveInventoryList grid IM construction.
...
This was a regression from 16c9c1dfhttp://opensimulator.org/mantis/view.php?id=6360
2012-10-16 01:33:35 +01:00
0eb457442d
minor: Add missing newlines and spacing to help for "debug eq" console command
2012-10-16 01:31:51 +01:00
d469bde849
minor: Add/correct some doc messages associated with entity teleport.
...
I believe UseCircuitCode is sent on EnableSimulator EQ message, rather than EstablishAgentCommunication
At least with LL 3.3.4, EstablishAgentCommunication appears unnecessary in the teleport context -
viewer still requests it though possibly only after TeleportFinish(). However, we will continue to send it.
2012-10-16 01:20:41 +01:00
3ac6a423f7
minor: comment out "Registered seed capability" message for "Received SEED caps request" message for now.
...
I think this is more useful right now since it tells us if the viewer requested a seed caps at all in various scenarios (such as when teleporting to a new region).
2012-10-16 00:54:25 +01:00
8c2564c05c
minor: Comment out the region console caps message for now.
2012-10-16 00:40:28 +01:00
aba078c93f
Fix perms when linking an object. Set root part perms to the perms
...
of the link set to make the build floater behave consistently.
Fixes permissions exploit introduced on 23 August.
2012-10-14 17:32:46 +02:00
ce26730d4e
Allow bypassing perms dialog (console only)
2012-10-14 17:31:29 +02:00
de3ff44406
Make texture sedning use only two threads to make things less harsh on bandwidth
2012-10-14 17:10:26 +02:00
1e03344411
missing file
2012-10-13 22:45:09 +01:00
5986b4ee39
add mesh cache expire on region startup. Expires will be relative to
...
previus expire (assumed done only once at startup). File 'cntr' on cache
folder stores time. Deleting it will force a skip on expire. Default time
is 48hours before previus startup to account for failed ones etc.
2012-10-13 22:30:34 +01:00
dc460579fd
minor: Fix and elaborate on log information printed when an unrecognized estate method is received from the client.
2012-10-13 01:47:10 +01:00
666fb744a3
retouch mesh ids
2012-10-13 01:41:18 +01:00
946c2e7e7c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-10-13 01:05:28 +01:00
330b976a62
Improve on TBG Renfold's fix to llRequestSimulatorData DATA_SIM_POS by only performing HG regionflags service check if the region secret is not empty.
...
An empty RegionSecret is never HG, whilst a non-empty one may be HG or being genuinely used as a RegionSecret.
2012-10-13 01:03:09 +01:00
f6e166cd0b
Now using region flags for llRequestSimulatorData DATA_SIM_POS.
...
If the region is not classed a hypergrid region, then the region secret is checked to make sure that it is a valid UUID.
Just a temporary fix at this time.
2012-10-13 00:50:34 +01:00
9ada03bcdd
missing file (again)
2012-10-13 00:49:08 +01:00
48d2258f41
longer meshs identification keys, so first part on disk cache is it's asset id
2012-10-13 00:41:19 +01:00
13cb64a2c5
missing file
2012-10-12 23:46:48 +01:00
6e21796584
[TEST] disk cache meshs
2012-10-12 23:37:28 +01:00
Melanie