Commit Graph

22282 Commits (465abf01c0a45e38f32bc2afeb1b754baf4745c7)

Author SHA1 Message Date
Diva Canto 465abf01c0 Merge branch 'master' into 0.8.2-post-fixes
Conflicts:
	OpenSim/Framework/VersionInfo.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
2015-11-10 20:34:18 -08:00
UbitUmarov b383cdae33 fix cut points of UTF-8 strings 2015-11-10 20:08:44 -08:00
Diva Canto af7c002d52 Don't crash the sim if the map image is null. 2015-11-01 11:37:59 -08:00
Diva Canto 8a96d42e97 Don't crash the sim if the map image is null. 2015-11-01 11:36:11 -08:00
Melanie Thielker 6510ba8a64 Plumb the special VeriableWearablesSuported field which we will
temporarily use to determine extended wearableness
2015-11-01 01:15:31 +01:00
Melanie Thielker efcf0e4f2e Minor: Add an initializer to show what the default value would be. 2015-11-01 01:03:44 +01:00
Melanie Thielker 5f3b443c03 Remove an unneeded code path, it could never be reached. Ubit caught it
:)
2015-11-01 00:57:45 +01:00
Melanie Thielker 2198330142 This is the replacement fix for large regions and string version. 2015-11-01 00:40:13 +01:00
Melanie Thielker 6d0b45cd4e Revert "fix transfer protocol version in string format. These are not
fixes you are looking for..... (Jedi mind trick)

This reverts commit 19e5667451.
2015-11-01 00:35:27 +01: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
UbitUmarov 19e5667451 fix transfer protocol version in string format. Let that case have tests identical to new format (this still isnt for your babies keep them safe...) 2015-10-31 21:50:24 +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
Melanie Thielker dc6bdbf740 Put back the option of having asymmetrical protocol versions in
transfers
2015-10-31 16:57:24 +01:00
UbitUmarov ed909f56da fix mantis 7734, Thanks Garmin for the report 2015-10-31 13:22:50 +00:00
UbitUmarov 1030d07f31 simplify new regions protocol version control. (May not work, and babies safety warnings still valid 2015-10-31 12:57:14 +00:00
UbitUmarov 9232876421 let silly tests override version on local connections 2015-10-31 02:05:11 +00:00
UbitUmarov 400c61cd60 fix teleport to to string version regions 2015-10-31 00:06:30 +00:00
Melanie Thielker f0fd028ed9 Merge branch 'master' of opensimulator.org:/var/git/opensim 2015-10-31 00:06:34 +01: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 dd9b06e3b6 fix mantis 7733, reverting setting of IsAttachment on first call to full check. Replace instead same simple IsAttachment tests by full checks 2015-10-29 22:14:11 +00:00
UbitUmarov 8b1ae501b5 fix services handling of visualparameters, avoiding possible crashs (mantis 7732) partially appling code from avinationmerge 2015-10-27 18:39:33 +00:00
UbitUmarov 84c8a7ae53 set SOG.IsAttachment when doing a full check, so future gets see the right value 2015-10-25 20:43:35 -07:00
UbitUmarov c3532ba876 set SOG.IsAttachment when doing a full check, so future gets see the right value 2015-10-25 19:59:05 +00:00
Diva Canto 70b681d21e Removed invalid dependencies from prebuild (those dlls no longer exist) 2015-10-22 21:46:02 -07:00
Diva Canto 36af6a3baa Removed invalid dependencies from prebuild (those dlls no longer exist) 2015-10-22 21:44:54 -07:00
Diva Canto 2c729a1a63 Mark XAssetService obsolete and warn users. 2015-10-21 19:23:26 -07:00
Diva Canto 719c0d09ae Mark XAssetService obsolete and warn users. 2015-10-21 19:22:20 -07:00
Diva Canto 426bbb63dd Fix an issue introduced in 70a46fe090. I accidentally deleted the entire [EntityTransfer] section instead of just a few variables in it. 2015-10-21 16:52:08 -07:00
Diva Canto 41b28550ad Fix an issue introduced in 70a46fe090. I accidentally deleted the entire [EntityTransfer] section instead of just a few variables in it. 2015-10-21 16:47:56 -07:00
Melanie Thielker 4fd48ae8b3 Let the initiator of a teleport or crossing know that we handle extra
wearables
2015-10-20 01:00:18 +02:00
Melanie Thielker 2b437f8d86 Let the initiator of a teleport or crossing know that we handle extra
wearables
2015-10-20 00:58:16 +02:00
Diva Canto 06d2508b96 On to 0.8.3! 2015-10-18 21:47:10 -07:00
Diva Canto a7f42ea8f1 Added warning in RegionCombinerModule about it being considered obsolete and encouraging people to switch to varregions. 2015-10-18 17:01:28 -07:00
Diva Canto e6163c990e Added warning in RegionCombinerModule about it being considered obsolete and encouraging people to switch to varregions. 2015-10-18 16:59:47 -07:00
Diva Canto 36573b4568 Flipped flavour to RC1. 2015-10-18 16:30: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
Diva Canto 339e252cce The protocol version checking on the grid server connector seemed to have a bug. I think I fixed it. 2015-10-18 11:06:21 -07:00
UbitUmarov e2d7e6290d fix GetTerrainHeightAtXY also on master. Fix wrong active angularlock detection (it was only burning cpu), stop trying to add a amotor to each child part and fix a typo. 2015-10-17 20:07:52 +01:00
UbitUmarov 0f6c3fb242 my first commit 2015-09-14 23:37:39 +01:00
Melanie Thielker 82105ba81d Change the actual versions allowed to connect, which is different from
the interface major version
2015-09-14 01:26:30 +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
Diva Canto a6012a3fae Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2015-09-11 09:49:33 -07:00
Diva Canto 29aaf5564f Mantis #7720: AssetXferUploader was setting AssetID to UUID.Zero. Before that wouldn't matter (item would be a terminal object) but with the introduction of the item cache, it matters, because the object in the cache was being modified to have AssetID=UUID.Zero. Also keeping the item cache consistent when item properties change. 2015-09-11 09:48:51 -07:00
Melanie Thielker e26d0ee40a Make sure the chat module doesn't deactivate just because the section
heading is missing
2015-09-09 05:40:39 +02:00
Diva Canto 45046858a1 Typos in comments 2015-09-06 14:57:18 -07:00
Diva Canto 3a72e755b9 Deleted access control spec from [LoginService] section of standalone config. It's in OpenSim.ini now under [AccessControl]. Backwards compatibility preserved. 2015-09-06 10:02:16 -07:00
Diva Canto 82ea4179da Clean up viewer-based access control specifications. 2015-09-06 10:00:20 -07:00
Diva Canto 4f208b6282 Related to previous commits: fixed namespace. 2015-09-06 09:31:35 -07:00