ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-19 14:35:44 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,345 Commits 5 Branches 93 Tags
c19183932e8daae7a178ae034985365c7af2bcb6
Commit Graph

412 Commits

Author SHA1 Message Date
UbitUmarov
affcdcce8b try to send fly state on tps 2014-09-16 21:25:06 +01:00
UbitUmarov
25bc349ec9 near region check on tp needs to be a full current view check. 
sp.KnownRegions is unreliable for this.
 2014-09-05 12:28:57 +01:00
UbitUmarov
38fc1cc445 try to make child presence know its root region. Incomplete, some paths dont send the information. 2014-08-28 00:44:59 +01:00
UbitUmarov
620443f858 on TPs to nearby regions, only send kills if needed by parcel privacy 2014-08-27 00:37:05 +01:00
UbitUmarov
094d8686e5 put back the kills on tp where they belong 2014-08-24 02:23:00 +01:00
UbitUmarov
d5814ccf65 *test* move sending kills to before sending the update, this breaks tp 
abort
 2014-08-24 01:04:32 +01:00
UbitUmarov
6674548af0 replace AgentHasMovedAway + KillEntity by a hacked version on teleports 2014-08-21 22:42:45 +01:00
UbitUmarov
ffcc1d7fa2 undo the hack.. its useless 2014-08-18 23:14:04 +01:00
UbitUmarov
96de2a2fd2 reduce the kills sent, hide attachments kills on origin 2014-08-18 04:07:40 +01:00
UbitUmarov
f8e4805d98 NOT GOOD. Changed hide code on crossing/tp. Send needed avatar and attachments 
kills, visible so we can see what is going on, to try to improve later
(this are always needed, hidding just made issues more visible )
 2014-08-18 01:34:16 +01:00
UbitUmarov
31a2c07e83 put bake bakes, plus a missing change forcing animations to pass by 
scenepresence
 2014-08-17 09:54:38 +01:00
UbitUmarov
7ce32d717a TEST disable again baked textures on crossing 2014-08-17 07:57:26 +01:00
UbitUmarov
d3b3822006 TEST DANGER InformClientOfNeighbourAsync do nothing unless a newagent 2014-08-17 07:32:24 +01:00
UbitUmarov
8d11b96cd9 *DANGER* rearange EnableChildAgents() so that hopefully it does it job 
better, like not telling clients to log on regions where they are already
child
 2014-08-17 05:59:14 +01:00
UbitUmarov
99a87f18c0 bad test 2014-08-17 04:24:55 +01:00
UbitUmarov
722b3a6523 make EnableChildAgent async from caller 2014-08-17 03:22:05 +01:00
UbitUmarov
4a20760929 remove hack to break sending of baked cache on agent cross update 2014-08-17 02:26:35 +01:00
UbitUmarov
90987a5484 DEBUG intencional break of sending baked cache 2014-08-16 22:56:56 +01:00
UbitUmarov
f6642a1cc8 minor low resolution debug timming 2014-08-16 21:53:45 +01:00
UbitUmarov
21b3980d2b send avatar Height to children, use it in region tp height check 2014-08-16 21:46:25 +01:00
UbitUmarov
7d967c37f4 *test* just send default appearance ( something along path doesnt like 
null there )
 2014-08-16 00:25:27 +01:00
UbitUmarov
0720c201b2 on teleports dont send baked textures assets in CreateClient, they will do on the update sent next 2014-08-15 23:01:54 +01:00
UbitUmarov
72a6bca033 cleanup a bit 2014-08-15 21:26:50 +01:00
UbitUmarov
3e6f49f3be do CrossAttachmentsIntoNewRegion for old versions in the right place 2014-08-15 19:21:32 +01:00
UbitUmarov
a3e45a45bc refix hide on crossings 2014-08-15 19:05:27 +01:00
UbitUmarov
4d770082d5 let failed crossing say something abotu reason 2014-08-15 18:06:04 +01:00
UbitUmarov
1314a02a95 adjust createAgent delay on childs creation. Beeing bad, it should be high 
enougth to reasonable account for grid and region lag spikes
 2014-08-15 17:44:24 +01:00
UbitUmarov
b4a7126167 remove the delay on child creation on Neighbour since its amout in not 
predictable.
 2014-08-15 01:22:15 +01:00
UbitUmarov
f798f04686 add a extra delay in EnableChildAgents between CreateAgent() return and 
telling client to connect, to account for potencial async tasks that need
to finish before the client knocks at the door. Empirical value used
 2014-08-14 22:03:41 +01:00
UbitUmarov
395903d58f *DANGER* dont send baked textures assets to Neighbours. Possible we could 
send a lot less
 2014-08-14 02:36:50 +01:00
UbitUmarov
7fcd1068e7 TEST move parcelRegionCross to EntityTransferModule cross so it works on 
sitting avatars. (may be bad) comented out sending root avatars
information to the child that was just a root it should have it all
already. Dont turn a sitting avatar physical,  that needs to be a stand at SOG
 2014-08-10 20:09:02 +01:00
Melanie Thielker
1a407e2545 Stop deleting objects that have status DIE_AT_EDGE set when they cross regions. 
This was an OpenSim hack to prevent vehicles from trying to cross.
 2014-08-03 17:32:34 +02:00
UbitUmarov
6c3e08e18d revert my change of not adding physcis to a failed avatar transfer. This 
may need a better fix later ( doing a stand elsewhere?)
 2014-07-24 00:58:23 +01:00
UbitUmarov
9936f13c1b on transfer fail of sited avatars, only do 2014-07-24 00:56:48 +01:00
UbitUmarov
46695ddbfe fix line ending 2014-07-24 00:30:38 +01:00
UbitUmarov
f394fabfc0 if sited avatar cross fails, dont add it to physics and dont mess scripts 
(?)
 2014-07-22 16:28:30 +01:00
Melanie
c6e9db5866 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/RegionSettings.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
	OpenSim/Region/Framework/Interfaces/IInterregionComms.cs
	OpenSim/Region/OptionalModules/World/NPC/Tests/NPCModuleTests.cs
 2014-01-28 21:02:20 +00:00
Oren Hurvitz
3018b2c5d7 Materials module: a) Store materials as assets; b) Finalized it (removed the "Demo" label; removed most of the logging); c) Enabled by default 
Changed UuidGatherer to use 'sbyte' to identify assets instead of 'AssetType'. This lets UuidGatherer handle Materials, which are defined in a different enum from 'AssetType'.
 2014-01-20 00:38:42 -08:00
Justin Clark-Casey (justincc)
9fefbcf7fc minor: since structs are values, assigning them to another variable copies it. Instantiation is unnecessary. 2014-01-17 23:32:37 +00:00
Melanie
e79fab91db Intermediate commit. Sill errors. 
Merge branch 'master' into careminster

Conflicts:
	OpenSim/Data/SQLite/SQLiteUserProfilesData.cs
	OpenSim/Framework/RegionInfo.cs
	OpenSim/Region/ClientStack/Linden/Caps/EventQueue/EventQueueHelper.cs
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
	OpenSim/Services/UserProfilesService/UserProfilesService.cs
 2014-01-05 20:12:32 +00:00
Robert Adams
38148bd4b6 Some missing definitions needed for successful compilation. 2014-01-04 19:01:05 -08:00
Robert Adams
7e32313a49 varregion: Add region size to teleport event messages (EnableSimulator, 
CorssRegion, TeleportFinishEvent).
Have Simian grid service return the region size.
Many teleport related debug log messages. Can be removed when teleport
works (like that's ever going to happen).

Conflicts:

	OpenSim/Framework/RegionInfo.cs
 2014-01-04 19:01:04 -08:00
Melanie
97934e00e6 This is the Avination Entity Transfer Module. Surprisingly, it still compiles 
but I don't know if it runs. Will probably crash and burn as the supporting
code isn't there yet.
 2013-12-11 00:12:36 +00:00
Melanie
75c68fa29e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Data/MySQL/MySQLSimulationData.cs
	OpenSim/Data/MySQL/Resources/RegionStore.migrations
	OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
	OpenSim/Region/CoreModules/World/LightShare/LightShareModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/Framework/Scenes/Tests/ScenePresenceCapabilityTests.cs
	OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-10-04 20:03:12 +01:00
Justin Clark-Casey (justincc)
b16bc7b01c refactor: rename Scene.IncomingCloseAgent() to CloseAgent() in order to make it clear that all non-clientstack callers should be using this rather than RemoveClient() in order to step through the ScenePresence state machine properly. 
Adds IScene.CloseAgent() to replace RemoveClient()
 2013-09-27 19:14:21 +01:00
Justin Clark-Casey (justincc)
d6d82dbd3c minor: correct attachment spelling mistake in log message in HGEntityTransferModule.OnIncomingSceneObject() 2013-09-26 20:13:29 +01:00
Justin Clark-Casey (justincc)
babfbe8d6d minor: log MaxOutgoingTransferVersion at EntityTransferModule startup 2013-09-26 00:31:33 +01:00
Justin Clark-Casey (justincc)
979b17165b For debug purposes, allow simulators to force use of earlier SIMULATION/0.1 teleport protocol even if SIMULATION/0.2 is available. 
This is specified in the MaxOutgoingTransferVersion attribute of [EntityTransfer] in OpenSim.ini, see OpenSimDefaults.ini for more details.
Default remains "SIMULATION/0.2"
Primarily for http://opensimulator.org/mantis/view.php?id=6755
 2013-09-19 22:45:50 +01:00
BlueWall
3c85afbb43 Allow setting the EntityTransfer-max_distance to 0 to override distance checks. This is to facilitate current viewer work fixing the distance limitations for teleporting. 2013-09-12 11:46:12 -04:00
Melanie
2f365ea80b Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
 2013-09-07 13:54:19 +01:00