ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-01 06:06:06 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,476 Commits 5 Branches 88 Tags
29798cefcc8d79f7495473c7ca275b58596fdc3d
Commit Graph

23902 Commits

Author SHA1 Message Date
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
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
UbitUmarov
e464bf5d82 recover scripts execution time stat i lost on previus changes. Behing async, this will not add with other time stats giving total frame time, as happens on other simulators. But its a good diag stat. 2015-10-21 18:34:06 +01:00
UbitUmarov
f84b75b1e0 update ubOde hashspaces levels 2015-10-21 01:50:28 +01:00
UbitUmarov
44deac4c1e we do not have prims with size 2^128, missing file 2015-10-21 01:41:04 +01:00
UbitUmarov
c37ea1910d fix or remove some wrong ODE configuration settings 2015-10-21 01:11:39 +01:00
UbitUmarov
deb4364f42 remove the use of Vector3 for axis locks on the rest of engines 2015-10-21 00:15:09 +01:00
UbitUmarov
ce5d5fc8dc the inertia matrix inversions and body inertia changes to implement axis locks need to be avoid, so use ubOde axis locks code. Hopefully this will not cause incompatibilities 2015-10-21 00:01:23 +01:00
UbitUmarov
747044f587 stop using a vector3 to store axis locks 3bit flags also in ode 2015-10-20 23:57:57 +01:00
UbitUmarov
f6891b36be stop using a vector3 to store axis locks 3bit flags in ubOde 2015-10-20 19:33:15 +01:00
UbitUmarov
0045398324 move ugly convertion of axis locks 3 bit flags to a wasted vector3 down to PhysicsActor. Let engines use LockAngularMotion with either Vector3 argument or byte 2015-10-20 19:00:26 +01:00
UbitUmarov
d8528a7ba0 add axis locks to sop serializer. Now they are also saved to inventory 2015-10-20 18:37:24 +01:00
UbitUmarov
3c69071145 also apply axis locks, when creating a prim physics actor 2015-10-20 18:21:13 +01:00
UbitUmarov
3e25430e3a store rotation axis locks in MySql and SQlite dbs ( others need to be updated also 2015-10-20 18:08:04 +01:00
UbitUmarov
52860a7d15 stop using a Vector3 to store 3bits 2015-10-20 16:55:18 +01:00