UbitUmarov
72684592ba
Merge branch 'master' into avinationmerge
...
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
OpenSim/Framework/Servers/ServerBase.cs
OpenSim/Framework/VersionInfo.cs
OpenSim/Region/CoreModules/Agent/AssetTransaction/AssetXferUploader.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/RemoteSimulationConnector.cs
OpenSim/Region/Framework/Interfaces/IEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
OpenSim/Region/PhysicsModules/Ode/ODEPrim.cs
OpenSim/Region/PhysicsModules/Ode/OdeScene.cs
OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
OpenSim/Services/HypergridService/GatekeeperService.cs
OpenSim/Services/Interfaces/IAvatarService.cs
OpenSim/Services/LLLoginService/LLLoginService.cs
2015-11-01 03:01:59 +00:00
Melanie Thielker
dc6d9eadf3
Testing stage of the new versioning system. Use at own risk. May not
...
work. Will eat your babies. Yada. Yada.
2015-10-31 00:01:35 +01:00
UbitUmarov
45ff7cec80
fix cut points of UTF-8 strings
2015-10-28 21:27:56 +00:00
UbitUmarov
6821ace3c6
add basic SendFindAgent() to lludp. Future use may require a list of pairs (X,Y). For now one pair is good enough.
2015-10-26 21:56:02 +00:00
Diva Canto
59b63b6406
On to 0.8.3!
...
Conflicts:
OpenSim/Region/PhysicsModules/ConvexDecompositionDotNet/Properties/AssemblyInfo.cs
2015-10-18 21:51:49 -07:00
Diva Canto
06d2508b96
On to 0.8.3!
2015-10-18 21:47:10 -07:00
Diva Canto
7ab633461e
Fixed merge conflicts
...
Clean up of simulation version, the number that rules the compatibility of teleports:
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
2015-10-18 16:24:33 -07:00
Diva Canto
70a46fe090
Clean up of simulation version, the number that rules the compatibility of teleports:
...
- It's not configurable anymore, it's fixed in code. Each number means an increase in features of the teleport procedure
- Its definition moved to the global VersionInfo class
As of now it's still 0.3.
2015-10-18 16:06:31 -07:00
UbitUmarov
4c0ef5a0ef
change version string
2015-09-28 12:37:12 +01:00
UbitUmarov
18536b4be6
add missing SendAgentGroupDataUpdate to llClientView
2015-09-27 06:38:19 +01:00
UbitUmarov
759789bc45
change console main help to match master
2015-09-24 02:07:30 +01:00
UbitUmarov
e441c9cac1
dont let http keepalive and context reuse be true
2015-09-23 23:59:50 +01:00
UbitUmarov
c7b1d52e29
remove duplicated and breaking code
2015-09-21 17:59:44 +01:00
UbitUmarov
42954349e4
temporary reduce maxwearables, so teleport testing can be performed before other regions get updated
2015-09-15 16:48:04 +01:00
Melanie Thielker
783aff9723
Bump Interface Version to 8
2015-09-14 00:36:47 +02:00
Melanie Thielker
9d1515efdb
Make regions tolerant to newer regions with more werables.
...
Also, bump the interface version to 8
2015-09-14 00:35:31 +02:00
Melanie Thielker
f24414c063
Remove the last proprietary copyright headers, insert BSD ones.
2015-09-13 21:03:38 +02:00
UbitUmarov
82785f559e
remove a avn thing before it gets into core
2015-09-10 13:00:30 +01:00
UbitUmarov
b93412972e
revert SynchronousRestObjectRequester timeout to miliseconds, and fix where it was wrong set in seconds
2015-09-09 23:17:18 +01:00
Robert Adams
e5367d822b
Merge of ubitworkvarnew with opensim/master as of 20150905.
...
This integrates the OpenSim refactoring to make physics, etc into modules.
AVN physics hasn't been moved to new location.
Does not compile yet.
Merge branch 'osmaster' into mbworknew1
2015-09-08 04:54:16 -07:00
Diva Canto
f928d41a27
Amend to previous commit: delete the corresponding AssemblyInfo's
2015-09-05 17:40:27 -07:00
Diva Canto
3cf07564b6
Moved the two region loaders into the RegionLoaderPlugin dll, therefore eliminating 2 top-level dlls that didn't make much sense.
2015-09-05 17:37:07 -07:00
UbitUmarov
0ddcc55166
let extra stats travel side by side with viewers ones... try to fix damm array indexes all over the place
2015-09-06 00:32:20 +01:00
Diva Canto
5bfc2743c6
Deleted unused file.
2015-09-05 15:20:32 -07:00
UbitUmarov
4b1ecc90fc
fix modifing m_threads on a foreach scanning it
2015-09-05 21:23:22 +01:00
Diva Canto
d00f73c3a4
Deleted OpenSim.Framework.Communications. Moved its two remaining files to OpenSim.Framework.
2015-09-04 14:39:23 -07:00
Diva Canto
9005365115
Deleted old unfinished code under Framework.Communications that wasn't being used anywhere.
...
Also folded GenericAsyncResult into RestClient, since it is used only there. This is preparation to remove Framework.Communications entirely.
2015-09-04 14:14:53 -07:00
Diva Canto
1559fc42b6
Deleted unused interface
2015-09-04 13:45:52 -07:00
UbitUmarov
f0c865555b
add a GetTimeStampMS method, this returns a time stamp in miliSeconds with the resolution avaiable for StopWatchs. Value in double since it can be large (as machine uptime in high resolution ticks)
2015-09-04 11:05:15 +01:00
UbitUmarov
b265e35d7c
missing file
2015-09-03 18:50:51 +01:00
UbitUmarov
cdaed11387
at last we can login and see objects ( friends is dead and disable in
...
scenepresence)
2015-09-03 18:39:08 +01:00
UbitUmarov
a11edceb00
seems to compile ( tests comented out)
2015-09-02 19:54:53 +01:00
UbitUmarov
371c9dd2af
bad merge?
2015-09-01 14:54:35 +01:00
Diva Canto
134d4300f0
All physics plugins are now region modules. Compiles but doesn't run.
2015-08-31 13:02:51 -07:00
UbitUmarov
0edffae7e4
more on tps and crossings
2015-08-30 19:17:35 +01:00
UbitUmarov
c7f148ee64
minor clear. Use isTainted in is read clear form
2015-08-27 14:13:23 +01:00
UbitUmarov
ef3deffeeb
remove rest of ushort test code
2015-08-25 17:54:49 +01:00
UbitUmarov
244f0c6352
change terrain internal representation to float. ushort work with legal
...
sl terrain, but may break existent terrain and that may cost a lot more
than the cost of memory
2015-08-25 16:51:48 +01:00
UbitUmarov
64d05bab0f
terrain stored as ushorts with gzip compression
2015-08-25 13:36:45 +01:00
UbitUmarov
1c752296bf
change internal representation of terrain from int to ushort. This will
...
suporte height from 0 to 655.53m that includes SL limits ( still need to
add code to trap eventual negative values from dbs or user input)
2015-08-24 18:40:28 +01:00
UbitUmarov
e3d82ad706
delay terrain sending if land queue is 2 busy
2015-08-22 04:08:30 +01:00
UbitUmarov
0b105da626
Merge branch 'mbworkvar2' into ubitvar
2015-08-19 08:48:50 +01:00
UbitUmarov
48ef22f62e
change pollService stop() to send 503 error and no keepalive. ( untested )
2015-08-18 23:59:55 +01:00
UbitUmarov
05d72f77ff
do keepalive on mesh and texture GET. Dont use reusecontext any where.
...
setting of keepalive is wrong, it should follow the requested one ( or
always as http1.1) only deny if needed (errors). KeepAlive may increase
stress on number of avaiable file descritors.
2015-08-18 21:32:03 +01:00
UbitUmarov
2cac56340a
try to serialize http requests from same connection, so they are processed
...
in order. ( next commits will be about necessary keepAlive changes needed)
2015-08-18 21:03:34 +01:00
Melanie Thielker
1fb2f0296f
Track selected objects per client
2015-08-15 02:46:41 +02:00
Oren Hurvitz
a3bed1fbcb
Report "Script Execution Time" as the time spent executing the script in the last 30 seconds. Use a sliding window to calculate this.
...
Notes:
- This metric provides a better indication of which scripts are taking up a lot of CPU (and therefore should be optimized).
- Previously the execution time was reset to 0 in every new measurement period, causing the reported time to fluctuate for no reason. This has been fixed by using a sliding window.
2015-08-11 08:42:26 +01:00
Oren Hurvitz
c8135834db
Prevent a crash if "debug jobengine log" is entered without a log level
2015-08-11 07:35:37 +01:00
Oren Hurvitz
4ad1468165
Better handling of invalid XML: a) prevent infinite loop on EOF; b) better logging
...
If the XML was truncated for some reason then ExecuteReadProcessors() would get into an infinite loop, using high CPU. Now it detects EOF (and several other error cases) and aborts.
The rest of the changes just improve logging of XML in case of errors, so that we can see what the bad XML is.
2015-08-11 07:35:37 +01:00
Diva Canto
2c9ffc2a87
Fixed failing test
2015-08-08 12:56:52 -07:00
