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

5227 Commits

Author SHA1 Message Date
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
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
9232876421 let silly tests override version on local connections 2015-10-31 02:05:11 +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
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
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
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
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
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
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
52860a7d15 stop using a Vector3 to store 3bits 2015-10-20 16:55:18 +01:00
UbitUmarov
dfd60d6f71 STATUS_ROTATE are linkset flags and not prim 2015-10-20 15:37:43 +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
UbitUmarov
8e333c953d in stats use real integration time, not the wanted one. Dont let stats calls overlap using a proper lock object 2015-10-12 11:29:13 +01:00
UbitUmarov
1af6ac4bfc remove unused method parameter master also removed 2015-10-02 17:44:19 +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
2abe1ccc59 change GetNewRezLocation physics ray results processing 2015-10-01 14:47:32 +01:00
UbitUmarov
6df75a927c let hoverheight rest position be a falling state 2015-09-30 20:37:14 +01:00
UbitUmarov
4a2e6db344 add high level code suport for SetHoverHeight() called from a attachment, so in future physics engines can also suport it 2015-09-30 17:34:25 +01:00
UbitUmarov
0151c773e2 let sp know about scene before anything else on creation 2015-09-30 06:05:28 +01:00
UbitUmarov
5b7a3c703d clamp all draw distance changes within region limits 2015-09-30 05:57:02 +01:00
UbitUmarov
feb78b2910 add several options for NPC creation so abusive use can be reduced (restrictive by default) UNTESTED 2015-09-30 02:45:11 +01:00
UbitUmarov
f97807b53f let us see our online friends 2015-09-28 20:57:33 +01:00
UbitUmarov
028cbb7cbe remove a auxiliar vector no longer needed 2015-09-28 18:10:27 +01:00
UbitUmarov
ad58f9b17e recover a lost position check for mega regions 2015-09-28 17:55:35 +01:00
UbitUmarov
05db03e809 fix unscripted sits without physics help 2015-09-26 03:14:06 +01:00
UbitUmarov
d0a7e5bd78 fix object rez on terrain, i broke adding physics assistance 2015-09-26 02:33:57 +01:00
UbitUmarov
0fb033e567 fix object crossings to other scene on same instance 2015-09-26 01:31:57 +01:00
UbitUmarov
e6f675b81b rearrange source code 2015-09-25 17:41:50 +01:00
UbitUmarov
2b0587770a add butterflies to terrain 2015-09-25 05:46:06 +01:00
UbitUmarov
13b8b17b9a we still don't have extended wind and cloud neither do viewers 2015-09-24 20:55:39 +01:00
UbitUmarov
a6b8eb7bca some cleanup on terrain encoder 2015-09-24 19:11:17 +01:00
UbitUmarov
f484773447 save a few more bits per flat patch 2015-09-24 15:23:52 +01:00
UbitUmarov
58daecfccb don't mess ray direction.. 2015-09-24 06:57:53 +01:00
UbitUmarov
af34bfddd1 add physics assistance on placement of a new object. This may help on mantis 7727, but may still need more work 2015-09-24 06:46:07 +01:00
UbitUmarov
c83351b9c0 fix the DC term on flat patch encoding 2015-09-23 22:35:27 +01:00
UbitUmarov
63bc0b574f speedup flat terrain patchs encoding, plus a few minor changes. 2015-09-23 21:04:13 +01:00
UbitUmarov
ccfb561e8d change the encapsulation of compressed land patchs in llUDP packets 2015-09-23 00:01:32 +01:00
UbitUmarov
032958709b last merging of sog m_linkedAvatars into m_sittingAvatars - untested. 2015-09-21 21:49:51 +01:00
UbitUmarov
25677e4a1b try to remove Scenepresence dependence on sog m_linkedAvatars, sitting may still work 2015-09-21 21:31:01 +01:00
UbitUmarov
04800a7570 add missing sit check 2015-09-21 19:56:59 +01:00
Kevin Cozens
b412db72be Fix a regression to GetSittingAvatars(). Return List<ScenePresence> once more. 2015-09-21 11:00:34 -04:00
UbitUmarov
87ad573ec2 MapBlockFromGridRegion and Map2BlockFromGridRegion are the same thing 2015-09-18 02:00:10 +01:00
UbitUmarov
b9137e2dee avoid a null ref (that should not happen after last commit), also reduce use of thread jobs, where one is good enought 2015-09-15 22:30:39 +01:00