OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
29,636 Commits
104 Branches
0 Tags
299 MiB
Commit Graph

29636 Commits (f7475d4a983e7744518932297a4292fcea9d0130)

Author SHA1 Message Date
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 d02f566b49 Merge branch 'master' into avinationmerge 2015-11-02 00:45:48 +01:00
Melanie Thielker 6bb12ab975 Set wearables count to max legacy wearables for version < 0.4 2015-11-02 00:45:05 +01:00
Melanie Thielker f88e4a1ec9 Plumb the rest of the context stuff. Well, what I see so far anyway 2015-11-02 00:23:38 +01: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
Diva Canto af7c002d52 Don't crash the sim if the map image is null. 2015-11-01 11:37:59 -08: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 29798cefcc Merge branch 'master' into avinationmerge 2015-11-01 04:12:17 +00: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
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 45ff7cec80 fix cut points of UTF-8 strings 2015-10-28 21:27:56 +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 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 9e6d9e0436 friends rights to edit objects display on viewers fixed. This needs to be optimized in future 2015-10-27 01:17:32 +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 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
UbitUmarov 8922d58f05 try fix IRC connector issue on mantis 7731 but with code a bit diferent from proposed patch. Also append '@irc' to nick on region messages, so message origin is clear 2015-10-26 18:00:01 +00: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
UbitUmarov 8d33ab903b merge issue: fix missing '/' 2015-10-24 22:48:31 +01:00
Diva Canto 6f69925c51 Removed invalid dependencies from prebuild (those dlls no longer exist) 2015-10-22 21:47:04 -07:00
Diva Canto 70b681d21e Removed invalid dependencies from prebuild (those dlls no longer exist) 2015-10-22 21:46:02 -07:00
UbitUmarov 28d4afbe3a replace objects scale clamp by a more readable clamp. Simplify GroupResize and let rescale factors < 1 also be checked for size limits, Set new scales directly not checking them again. 2015-10-23 01:39:53 +01:00
UbitUmarov 8ed17f745d let ode also finish internal representation of prim actors, before simulation 2015-10-22 18:03:49 +01:00
UbitUmarov 7cb6ecb9f5 Make physics engines finish internal representation of loaded prims before starting simulation so it does start for all at same time. Currently only in use by ubOde 2015-10-22 17:34:28 +01:00
UbitUmarov 7aaa84515f rename terrain for opensim and respective configuration flag that a future costumized ODE library may have 2015-10-22 16:20:19 +01:00
Diva Canto afba4dc1ce Mark XAssetService obsolete and warn users. 2015-10-21 19:26:00 -07:00
Diva Canto 719c0d09ae Mark XAssetService obsolete and warn users. 2015-10-21 19:22:20 -07:00
Diva Canto 25552dda7d 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:50:31 -07:00