ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-15 11:25:39 +08:00
Code Issues Packages Projects Releases Wiki Activity
27,619 Commits 5 Branches 93 Tags
f45905851ab0a49dd29fdff0491cefb75cca4b35
Commit Graph

4687 Commits

Author SHA1 Message Date
UbitUmarov
f45905851a at end of teleport disable the sending simulator, not destiny 2015-11-24 14:01:51 +00:00
UbitUmarov
7cf2d261b3 reduce 'echos' on several regions per instance (mantis 7754) 2015-11-24 12:51:58 +00:00
Jak Daniels
15af6265a1 Fixed some stupid math and checks on --bounding-origin and --bounding-size. Bounding origin can of course be negative if it needs to be as we're taking stuff from the (possibly rotated) source region. Bounding size must always be >=0 and <= destination region size. 
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
 2015-11-22 17:30:08 +00:00
UbitUmarov
f75d113230 change silly Monitor use 2015-11-22 08:40:55 +00:00
UbitUmarov
ec069edead change syncronization method 2015-11-22 08:31:54 +00:00
UbitUmarov
e28eecd0bf revert take the Monitor.wait out of the locks 2015-11-22 08:08:01 +00:00
UbitUmarov
1de096dffb coment out merge option on multiregion oar load i added 2015-11-22 08:00:58 +00:00
UbitUmarov
5c3f88b64d take the Monitor.wait out of the locks 2015-11-22 07:55:49 +00:00
UbitUmarov
b80cbf5060 a few more changes on Multiregion control file load 2015-11-22 07:18:11 +00:00
UbitUmarov
a6187db2a7 add a a missing monitor.wait if still not needed, mb in future 2015-11-22 05:44:06 +00:00
UbitUmarov
3be340cbf2 a few changes on Multiregion control file load ; load oar seems far from good 2015-11-22 05:42:13 +00:00
UbitUmarov
f6820959b7 add Monitor.wait on load 2015-11-22 04:49:01 +00:00
UbitUmarov
4349bde440 reduce noise before compare 2015-11-22 04:10:26 +00:00
UbitUmarov
6dcbd20cfa add merge option on multioar test 2015-11-22 03:58:07 +00:00
UbitUmarov
71f5c2b856 minor changes 2015-11-22 03:56:48 +00:00
UbitUmarov
541d2ce2cd don't use 'funny' Quaternions 2015-11-22 02:22:48 +00:00
Jak Daniels
0b216c37df Changes to Load Oar options and new code to support importing OARs with different Region sizes to the destination region. 
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
 2015-11-22 01:32:48 +00:00
Jak Daniels
cc992bf156 Changes to TerrainModule/ITerrainModule to support importing OARs with different Region sizes to the destination region. 
Signed-off-by: UbitUmarov <ajlduarte@sapo.pt>
 2015-11-22 01:32:36 +00:00
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