Jak Daniels
c0e920c1ad
Fix Region Max height in boundingSize parameters checking in ArchiverModule.cs to float.MaxValue .. as was changed in ArchiveReadRequest.cs in commit 71f5c2b856 A comparison of consistent 'default' values determines whether boundingBox check is true.
...
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt >
2015-11-27 00:16:08 +00:00
Jak Daniels
15af6265a1
Fixed some stupid math and checks on --bounding-origin and --bounding-size. Bounding origin can of course be negative if it needs to be as we're taking stuff from the (possibly rotated) source region. Bounding size must always be >=0 and <= destination region size.
...
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt >
2015-11-22 17:30:08 +00:00
UbitUmarov
f75d113230
change silly Monitor use
2015-11-22 08:40:55 +00:00
UbitUmarov
ec069edead
change syncronization method
2015-11-22 08:31:54 +00:00
UbitUmarov
e28eecd0bf
revert take the Monitor.wait out of the locks
2015-11-22 08:08:01 +00:00
UbitUmarov
1de096dffb
coment out merge option on multiregion oar load i added
2015-11-22 08:00:58 +00:00
UbitUmarov
5c3f88b64d
take the Monitor.wait out of the locks
2015-11-22 07:55:49 +00:00
UbitUmarov
b80cbf5060
a few more changes on Multiregion control file load
2015-11-22 07:18:11 +00:00
UbitUmarov
a6187db2a7
add a a missing monitor.wait if still not needed, mb in future
2015-11-22 05:44:06 +00:00
UbitUmarov
3be340cbf2
a few changes on Multiregion control file load ; load oar seems far from good
2015-11-22 05:42:13 +00:00
UbitUmarov
f6820959b7
add Monitor.wait on load
2015-11-22 04:49:01 +00:00
UbitUmarov
4349bde440
reduce noise before compare
2015-11-22 04:10:26 +00:00
UbitUmarov
6dcbd20cfa
add merge option on multioar test
2015-11-22 03:58:07 +00:00
UbitUmarov
71f5c2b856
minor changes
2015-11-22 03:56:48 +00:00
UbitUmarov
541d2ce2cd
don't use 'funny' Quaternions
2015-11-22 02:22:48 +00:00
Jak Daniels
0b216c37df
Changes to Load Oar options and new code to support importing OARs with different Region sizes to the destination region.
...
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt >
2015-11-22 01:32:48 +00:00
Jak Daniels
cc992bf156
Changes to TerrainModule/ITerrainModule to support importing OARs with different Region sizes to the destination region.
...
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt >
2015-11-22 01:32:36 +00: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
9566c000f2
work around some 'tests' errors: terrain effects limits changed
2015-11-17 05:25:08 +00:00
UbitUmarov
1e87e90915
work around some 'tests' errors: allow sitTargetposition and orientation to be read from OAR on opensim, they are reset at avination, this may cause issues with old sits
2015-11-17 03:42:46 +00:00
UbitUmarov
f57a48a0fb
fix silly bug
2015-11-10 20:34:19 +00:00
UbitUmarov
5bfd49404d
start TerrainCheckUpdates on heartbeat thread, but do it async; fix a bug on slow terrain send limits check
2015-11-10 17:44:53 +00: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
UbitUmarov
9ba288a2e7
fix typo reported on mantis 7735
2015-10-31 22:48:31 +00:00
UbitUmarov
114ac59314
dont tell clients that we can edit a friend's attachments when we do forbid it
2015-10-27 01:20:21 +00:00
UbitUmarov
d281ec5342
some fixes/changes on land send
2015-09-30 06:09:01 +01:00
UbitUmarov
8fde2fb901
slow down terrain sending so other users of LAND queue do have a chance to send things
2015-09-24 00:35:06 +01:00
UbitUmarov
33b4077c2c
revert my change to the range of greyscale image maps, setting it back to 0 - 127.5 so not to break loading of old files. There isnt a range that fits all needs anyway
2015-09-21 00:44:53 +01:00
UbitUmarov
fe5807cd09
fix terrain save greyscale mapping to 1:1 suporting standard 0-255m range and not only 0-127m. Jpeg format still using a non standard color encoded heightmap
2015-09-20 15:31:38 +01:00
UbitUmarov
56a4b5ba7a
put back the hack to make viewers display map tags (now and then at least) that i had removed and do it also on the local region. Make parcel overlay a bit less transparent than i did before.
2015-09-19 21:30:09 +01:00
UbitUmarov
ba4d0c1c6f
a few more changes to worldMap. Use ExpireCaches, cache remote mapItems requests, etc
2015-09-19 06:42:52 +01:00
UbitUmarov
87ad573ec2
MapBlockFromGridRegion and Map2BlockFromGridRegion are the same thing
2015-09-18 02:00:10 +01:00
UbitUmarov
4798cce390
sync remote responses for mapItens with the local ones, but sending all valid information, so later we can cache/throotle
2015-09-17 21:51:51 +01:00
UbitUmarov
ab18c801a9
dont block a region just bc it doesnt have the requested map item
2015-09-17 21:17:04 +01:00
UbitUmarov
f4093a04e7
dont create terrain map asset for V1 viewers on large regions again, but do create parcel overlay since current viewers seem to use it (or we are missing something elsewhere)
2015-09-17 21:11:59 +01:00
UbitUmarov
d767feafa4
generate maptile assets again, v2 do use at least the parcels overlay
2015-09-17 05:24:19 +01:00
UbitUmarov
f6c2e6e1a3
merge issues and a few more changes
2015-09-17 05:10:24 +01:00
UbitUmarov
133f3a41eb
remove bad merge code..
2015-09-17 01:43:10 +01:00
UbitUmarov
2d88e4cf73
mute watchdog timeouts on world map work threads. They do wait for events for a long time
2015-09-15 04:56:26 +01:00
UbitUmarov
5b3e2ab9aa
Merge branch 'mbworknew1' into ubitworkvarnew
2015-09-08 15:03:22 +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
UbitUmarov
7276a89ddd
recover opensim m_sendTerrainUpdatesByViewDistance. if false do as opensim (slower since it depended on sending terrain as TASK). if true send by view range and also all terrain at arrival
2015-09-07 11:23:00 +01:00
UbitUmarov
abd6640453
allocate llRAW LookupHeightTable on demand and release it, saving a few 512KB of memory
2015-09-07 08:06:41 +01:00
UbitUmarov
3a8e76cdd1
restore terrain modifiers, left out earlier bc of merge errors, (untested)
2015-09-07 07:50:51 +01:00
UbitUmarov
94d13c6d22
dont store/upload map asset for large regions, ( needs testing)
2015-09-06 01:21:20 +01:00
UbitUmarov
2130984bef
a few changes to stats. Array order coerent on users. give up on moses stats for now, since SimExtraStatsCollector cant reach SimStatsReport etc
2015-09-04 23:07:25 +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
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
