Diva Canto
55a9bbc6ce
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2015-11-29 09:48:48 -08:00
Diva Canto
1aa0234408
Trying to make http requests less slow, according to http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow
2015-11-29 09:48:17 -08:00
UbitUmarov
5aa1c0d328
coment out warnings that do a messed around number of threadpool workitens and number of active threads ( at least when a pool is in use)
2015-11-27 18:43:17 +00:00
UbitUmarov
9224b5d680
revert last change to watchdog timeouts, that should not be needed
2015-11-27 13:32:49 +00:00
UbitUmarov
baf8e762a6
change JobEngine stop code and add a extra check for thread removed on watchdog timeout checks
2015-11-27 13:28:10 +00:00
UbitUmarov
172bb05ec2
suspend the use of DisableSimulator, that is causing teleport and crossing issues
2015-11-25 04:13:13 +00:00
Melanie Thielker
774ac5e96b
If no job engine is started at all, keep checking it's status from
...
bombing
2015-11-24 21:10:40 +01:00
UbitUmarov
19b96697a6
try not to use Process.HasExit that is broken in some mono versions
2015-11-24 11:22:40 +00:00
Diva Canto
5e4b16658b
Flipped version to 0.9.0.0
2015-11-23 18:15:09 -08:00
Jak Daniels
b23e5fd8b6
Changes to LandObject/ILandObject to support importing OARs with different Region sizes to the destination region.
...
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt >
2015-11-22 01:31:48 +00:00
UbitUmarov
95a7a03052
work around some 'tests' error: normalization of <0,0,0> no longer causes argument exception, missed a few more
2015-11-16 19:00:53 +00:00
UbitUmarov
fd2784a037
work around some 'tests' error: normalization of <0,0,0> no longer causes argument exception
2015-11-16 18:50:15 +00:00
Melanie Thielker
b2592ab132
Fix a merge conflict
2015-11-16 15:30:39 +01:00
Melanie Thielker
f93ce485b1
Merge branch 'master' into avinationmerge
...
Conflicts:
OpenSim/Framework/AvatarAppearance.cs
2015-11-16 15:28:51 +01:00
UbitUmarov
53e0cd5534
handle diferente number of wearables on getting assets form another appearance
2015-11-15 10:04:35 +00:00
UbitUmarov
bcb27d4406
fix the protection for more Wearables than region suports
2015-11-15 08:16:52 +00:00
UbitUmarov
b383cdae33
fix cut points of UTF-8 strings
2015-11-10 20:08:44 -08:00
UbitUmarov
ae9d40c7d0
add a StringToBytes variant that takes Maximum lenght as argument.
2015-11-10 14:29:13 +00:00
UbitUmarov
baf5649b70
fix avatarAppearance wearables copy
2015-11-02 02:08:13 +00:00
Melanie Thielker
51e5204a67
Add forgotten file
2015-11-02 01:21:28 +01:00
Melanie Thielker
5f18f2ce6a
More EntityTransferContext plumbing
2015-11-01 19:37:14 +01:00
Melanie Thielker
69585a4824
More plumbing of the EntityTransferContext (not yet complete)
2015-11-01 19:11:14 +01:00
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
