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
c84334fc72
add a missing override
2015-11-21 19:53:14 +00:00
UbitUmarov
36426b0db2
remove some compile warnings increasing total number by 2
2015-11-21 00:49:43 +00:00
UbitUmarov
4a0531244a
change a log message from error to just Debug
2015-11-20 00:45:12 +00:00
UbitUmarov
0c93159297
remove unused return value on DeliverMessageTo()
2015-11-20 00:09:56 +00:00
UbitUmarov
278687b1e8
remove duplicate object chat messages ( mantis 7745 ),fix llRegionSay, this are still merge issues
2015-11-20 00:01:13 +00:00
UbitUmarov
36f7e96392
clean code a bit
2015-11-19 15:02:12 +00:00
UbitUmarov
2e43343ca9
ClearPartAttachmentData before adding object to scene, not after
2015-11-19 14:45:39 +00:00
UbitUmarov
a4ed111de1
cleanup indentation
2015-11-18 17:45:56 +00:00
UbitUmarov
6dafce9a12
fix another variable number of wearable types issue
2015-11-18 17:35:26 +00:00
UbitUmarov
6c766f3ab4
remove unused parameter - missing file
2015-11-17 08:02:48 +00:00
UbitUmarov
f7f5aba597
remove unused parameter
2015-11-17 07:59:11 +00:00
UbitUmarov
cd29abf1ac
work around some 'tests' errors: fix wrong parameters
2015-11-17 07:22:36 +00:00
UbitUmarov
81b7f5551c
work around some 'tests' errors: sp attachments and appearance are not in sync
2015-11-17 06:52:03 +00:00
UbitUmarov
9566c000f2
work around some 'tests' errors: terrain effects limits changed
2015-11-17 05:25:08 +00:00
UbitUmarov
364082d0e8
work around some 'tests' errors: add a httpserver
2015-11-17 04:19:30 +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
d1737de8d2
work around some 'tests' errors: Coalesced objects handling has changed
2015-11-17 03:10:59 +00:00
UbitUmarov
8567ef3c40
work around some 'tests' errors: test for null cacheItems
2015-11-17 03:00:27 +00:00
UbitUmarov
e15ebc091f
bug fix: improve chat to child avatars. Still not good because of low resolution of child position updates
2015-11-17 01:31:06 +00:00
UbitUmarov
d19e4f598f
deatach from backup on attachment
2015-11-16 20:12:40 +00:00
UbitUmarov
9b6633697b
coment out excessive debug messages
2015-11-16 17:35:20 +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
527ea37540
change OfflineMessageModule from new avination code to original master, for compatibility with current web servers php scripts. This may change after current test phase
2015-11-06 05:18:54 +00:00
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
