ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-19 22:45:43 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,004 Commits 5 Branches 93 Tags
552b4e45e8700cc71bbbea18b5bad167998a74e4
Commit Graph

2644 Commits

Author SHA1 Message Date
UbitUmarov
552b4e45e8 bakemodule didnt like last changes 2014-08-06 05:56:10 +01:00
UbitUmarov
66dea8fe05 some debug to remove later 2014-08-06 05:17:30 +01:00
UbitUmarov
bd3d58dd00 try to make the baked textures cache work 2014-08-06 04:54:14 +01:00
UbitUmarov
3cca5ec667 check... 2014-08-04 21:52:29 +01:00
UbitUmarov
3d81f25e34 Revert "start sending terrain in scenePresence after well defined avatar. Minor" 
This reverts commit 05a2feba5d.
 2014-08-04 20:32:11 +01:00
UbitUmarov
05a2feba5d start sending terrain in scenePresence after well defined avatar. Minor 
change on significante AgentUpdate check.
 2014-08-04 19:57:47 +01:00
UbitUmarov
9f5e19127d comment out a debug msg. more on gods being Gods 2014-08-03 00:22:21 +01:00
UbitUmarov
30f00bfb14 make HandlerRegionHandshakeReply processing async and delay it a bit. This 
delays things like terrain height map sending, giving chance to
completemovent to send more priority information. POssible things on this
should be on other event trigger when its more apropriate
really done.
 2014-07-30 21:11:11 +01:00
Melanie Thielker
dfa9780c8c Send new parcel permissions to activate viewer options - done right this time 2014-07-29 04:19:01 +02:00
Melanie Thielker
477b5b5623 Add new fields to parcel update 2014-07-29 03:40:05 +02:00
UbitUmarov
55df2b317c dont send packets twice 2014-07-27 12:02:59 +01:00
UbitUmarov
70890e211a add queue transition code needs review/more testing 2014-07-25 17:33:01 +01:00
UbitUmarov
fa59cddc28 remove old and dead code that its only making it hard to understand 2014-07-25 13:03:40 +01:00
UbitUmarov
86a9710e77 change previus code, send a NoEvents response back to http server, even 
if we know there is no one there, so that the server finishes handling
 it.
 2014-07-24 23:32:39 +01:00
UbitUmarov
ee951f7a10 EventQueueGetModule: dont reuse queues, we dont know whats there; make 
pool silently loose requests for unknown avatars, or they will stay active
until timeout after close ( possible not a big problem after not reusing
queues ? )
 2014-07-24 17:14:14 +01:00
UbitUmarov
3e73e96bef fix HUD attachment update filter to allow avatar center etc 2014-07-22 01:49:42 +01:00
UbitUmarov
a5fcc0c0c0 remove avn hack on sitted avatars positions 2014-07-20 14:47:35 +01:00
Melanie Thielker
5000a5c038 Fix coalesced objects not showing up as "piles" of prims (AVN only bug) 2014-07-20 00:17:35 +02:00
Melanie Thielker
159fcbf150 Merge branch 'master' of ssh://3dhosting.de/var/git/careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
 2014-06-21 00:39:55 +02:00
Melanie Thielker
5c661baf6c Allow opening a https port using only http so that nginx can be used for ssl 2014-04-26 02:42:30 +02:00
Melanie Thielker
f93dac9239 Implement Oren's fix to prevent a privilege escalation with groups 2014-04-20 10:47:31 +02: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
Mic Bowman
83626e60e6 Adds a configuration option to cannibalize bandwidth from the 
udp texture throttle and move it to the task throttle. Since most
viewers are using http textures, the udp texture throttle is holding
onto bw that could be used for more responsive prims updates. See
the documentation for CannibalizeTextureRate in OpenSimDefaults.ini.
Option is disabled by default.
 2014-01-20 18:59:43 -08:00
Justin Clark-Casey (justincc)
32e9c16957 Merge branch 'justincc-master' 2014-01-08 01:04:26 +00:00
Justin Clark-Casey (justincc)
0155d42b80 If an agent is sitting, then do send the rotation in the agent update instead of zeroing it to resolve mouselook camera problems 
Addresses http://opensimulator.org/mantis/view.php?id=6892
Thanks to tglion for this spot.
This resolves a recent regression from 17b32b764a
 2014-01-08 00:54:39 +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
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
dd96fef940 Dynamically adjust to the number of visual params sent. 2014-01-04 21:18:37 +00:00
Justin Clark-Casey (justincc)
68773ee7c4 Merge branch 'justincc-master' 2013-12-19 01:41:04 +00:00
Justin Clark-Casey (justincc)
a5ca15c428 Create regression test TestSendAgentGroupDataUpdate() for groups agent data sending 2013-12-18 23:35:38 +00:00
Melanie
5b73b9c4a8 Committing the Avination Scene Presence and related texture code 
- Parts of region crossing code
- New bakes handling code
- Bakes now sent from sim to sim without central storage
- Appearance handling changes
- Some changes to sitting
- A number of unrelated fixes and improvements
 2013-12-11 01:39:56 +00:00
Melanie
6d6b9ab791 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2013-12-07 01:08:49 +00:00
Justin Clark-Casey (justincc)
bb4f4d9480 minor: Use enums for setting inv/asset types on data upload rather than magic numbers 2013-12-06 00:38:18 +00:00
Justin Clark-Casey (justincc)
16aaba77d4 Properly set InventoryType.Snapshot when a snapshot is uploaded 
Resolves http://opensimulator.org/mantis/view.php?id=6857
This prevents the inventory service complaining later about an attempt to change an invariant
 2013-12-06 00:30:44 +00:00
Justin Clark-Casey (justincc)
17b32b764a Fix regression where mouse look flight direction no longer worked by zeroing x/y rot before sending agent updates, instead of before any agent update processing 
It turns out that the x/y rot data in mouselook is needed to implement this and to push the avatar against the ground if walking in mouselook.
Doing this in the terse send so that we preserve mouselook rotation information
 2013-12-05 02:10:46 +00:00
Justin Clark-Casey (justincc)
8b3a4367ea Still send CameraEyeOffset in UDP SendSitReponse even if at offset is Vector3.Zero 2013-11-29 02:51:35 +00:00
Justin Clark-Casey (justincc)
ca079c378a Merge branch 'link-sitting' 2013-11-29 02:41:32 +00:00
Justin Clark-Casey (justincc)
0785210e29 Fix stand positions rather than having the stand jump to the root prim. 2013-11-27 02:08:22 +00:00
Melanie
3589acdab1 Merge branch 'master' into careminster 
Conflicts:
	.gitignore
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	prebuild.xml
	runprebuild.bat
 2013-11-23 19:13:22 +00:00
Justin Clark-Casey (justincc)
60e049ea39 Revert "Fix issue where sitting on non-root linked prims would send camera to wrong position in third-person and mouselook" 
Reverting to place on separate branch

This reverts commit ff4e7de776.
 2013-11-23 02:31:39 +00:00
Justin Clark-Casey (justincc)
a68d1fad73 Revert "Still send CameraEyeOffset in UDP SendSitReponse even if at offset is Vector3.Zero" 
This reverts commit 9bdd3dc7de.
 2013-11-23 02:29:14 +00:00
Justin Clark-Casey (justincc)
9bdd3dc7de Still send CameraEyeOffset in UDP SendSitReponse even if at offset is Vector3.Zero 
As far as I can see it's valid to change the eye offset even if you aren't changing the at target.
 2013-11-23 01:12:20 +00:00
Justin Clark-Casey (justincc)
ff4e7de776 Fix issue where sitting on non-root linked prims would send camera to wrong position in third-person and mouselook 
We now specify sits as offsets from the root prim, as the viewer expects.
 2013-11-23 00:53:09 +00:00
Melanie
91b70bf3fe Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
 2013-11-08 17:55:01 +00:00
Latif Khalifa
26fd29622d Added sending (for now hard-coded) sim isze in SendMapBlockSplit() 2013-11-06 03:52:04 +01:00
Justin Clark-Casey (justincc)
8e1bf55e7b Add IncomingPacketsResentCount clientstack statistics 
This records how many packets were indicated to be resends by clients
Not 100% reliable since clients can lie about resends, but usually would indicate if clients are not receiving UDP acks at all or in a manner they consider timely.
 2013-11-06 01:02:20 +00:00
Justin Clark-Casey (justincc)
4c4a1cf715 Start counting resent packets in the places that I missed when the stat was first added a few commits ago 2013-10-31 23:59:22 +00:00
Justin Clark-Casey (justincc)
50794c9008 minor: remove mono compiler warnings in AvatarPickerSearchModule and UploadBakedTextureModule 2013-10-31 23:51:01 +00:00
Justin Clark-Casey (justincc)
3d5a7e9b19 Add OutgoingPacketsResentCount clientstack stat. 
This allows one to monitor the total number of messages resent to clients over time.
A constantly increasing stat may indicate a general server network or overloading issue if a fairly high proportion of packets sent
A smaller constantly increasing stat may indicate a problem with a particular client-server connection, would need to check "show queues" in this case.
 2013-10-31 23:45:52 +00:00
Justin Clark-Casey (justincc)
df76e52310 minor: Add commented out code for apparent passing of texture IDs in ObjectProperties UDP replies to viewer 
Not yet shown that this is used or resolves a bug where not all textures appear on objects with an "XML with textures" upload from singularity 1.8.3
Proper texture entries are actually present and appear properly on relog, but not on select from viewer until at least one face texture is changed.
 2013-10-24 23:00:02 +01:00