Melanie Thielker
3da0a318b3
Merge branch 'avinationmerge' of opensimulator.org:/var/git/opensim into avinationmerge
2015-11-01 23:40:54 +01:00
Diva Canto
aea86f30a0
Don't crash the sim if the map image is null.
2015-11-01 11:38:41 -08:00
Melanie Thielker
69585a4824
More plumbing of the EntityTransferContext (not yet complete)
2015-11-01 19:11:14 +01:00
UbitUmarov
54e1d54fb5
fix more merge issues
2015-11-01 03:33:19 +00:00
UbitUmarov
24472c3b67
fix merge issues
2015-11-01 03:25:36 +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
af4ca8e80e
fix internal support for non square regions
2015-10-31 21:58:40 +00:00
Melanie Thielker
ea56f4f27c
Introduce an EntityTransferContext carrying the version numbers to pass
...
to all interested functions. Should fix the varregion conditional.
Still a testing version, do NOT use in production!
2015-10-31 18:13:02 +01:00
Melanie Thielker
e8e0ba6d8f
Remove testing cruft that is blocking the new protocols. Unit tests no
...
longer test TP v1 now.
TP v1 will be removed within 6 months anyway.
2015-10-31 17:22:27 +01:00
UbitUmarov
ed909f56da
fix mantis 7734, Thanks Garmin for the report
2015-10-31 13:22:50 +00:00
UbitUmarov
9232876421
let silly tests override version on local connections
2015-10-31 02:05:11 +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
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
1982d72320
Make changes to a friend rights reach him on another sim; find on map does show the region. Issues: precise location on region still not avaiable and object edit permitions on viewers edit are not being updated (but are enforced by region). friends information is updated, and warnings are displayed. Only did minor testing...
2015-10-26 22:42:48 +00:00
UbitUmarov
8d33ab903b
merge issue: fix missing '/'
2015-10-24 22:48:31 +01: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
1af6ac4bfc
remove unused method parameter master also removed
2015-10-02 17:44:19 +01:00
UbitUmarov
31873485d9
do not send DisableSimulator on teleport if agent is already returning
2015-10-02 02:42:25 +01:00
UbitUmarov
6ae7341e42
send DisableSimulator messages on closing childagents. Possible still not on at best timming, or on the right source files
2015-10-01 20:50:12 +01:00
UbitUmarov
6bc479fecd
make bakes reception handle empty BakedTexture elements. But at same time stop sending them, only sending to Xbakes server items that do have a texture, like master does
2015-10-01 19:30:37 +01:00
UbitUmarov
d281ec5342
some fixes/changes on land send
2015-09-30 06:09:01 +01:00
UbitUmarov
93af984e94
add missing handlers for preferences
2015-09-28 13:22:32 +01:00
UbitUmarov
55d0425dfe
add missing handlers for preferences
2015-09-28 12:47:29 +01:00
UbitUmarov
ae195632e9
add the Default Groups module lost in the merge
2015-09-26 18:18:29 +01:00
UbitUmarov
239dcaffb7
coment out some debug, clean a bit
2015-09-26 14:14:05 +01:00
UbitUmarov
0fb033e567
fix object crossings to other scene on same instance
2015-09-26 01:31:57 +01:00
UbitUmarov
07a8618c56
revert previus wrong commit
2015-09-25 21:43:51 +01:00
UbitUmarov
40ae9ec554
patch objects crossings for var regions, until region location is fully fixed
2015-09-25 18:38:52 +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
812e808cee
remove messages on agents cross fails that got merged
2015-09-17 08:18:35 +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
2f1eab2792
remove bad merge from master
2015-09-16 16:34:16 +01:00
UbitUmarov
9ac01010f4
change point of evocation of AgentHasMovedAway for HG
2015-09-16 04:32:09 +01:00
UbitUmarov
2bd7bbd1cb
restore some avn code, fixing for var regions
2015-09-16 02:25:12 +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
5becc16acf
try to improve vehicles crossing with Xengine. Lag seems main issue now, but needs testing, specially the fail cases, that most likelly need more work
2015-09-14 16:40:01 +01:00
