ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-31 18:19:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
25,469 Commits 5 Branches 97 Tags
0af2fafddf36009ffe470da106dc6d0ceb3ced10
Commit Graph

337 Commits

Author SHA1 Message Date
UbitUmarov
0b105da626 Merge branch 'mbworkvar2' into ubitvar 2015-08-19 08:48:50 +01:00
UbitUmarov
fd82a0a0b7 add a Retry-After response header to the 503 sent when we are 2 busy to do 
the request. just 503 could mean server down (?)
 2015-08-19 00:26:43 +01:00
UbitUmarov
05d72f77ff do keepalive on mesh and texture GET. Dont use reusecontext any where. 
setting of keepalive is wrong, it should follow the requested one ( or
always as http1.1) only deny if needed (errors). KeepAlive may increase
stress on number of avaiable file descritors.
 2015-08-18 21:32:03 +01:00
Robert Adams
08c72a8dc1 varregion: remove use of Constants.RegionSize is various places. 
More use of the Util routines for conversion of region handles into addresses.
 2015-03-28 07:50:04 -07:00
UbitUmarov
9a3df6445e move AnimationSet and AvatarSkeleton to OpenSimExtras 2014-10-12 12:52:12 +01:00
UbitUmarov
39cfd82303 add simulator features AvatarSkeleton and AnimationSet report 2014-10-11 22:53:47 +01:00
UbitUmarov
c3e88b7b38 changed skeleton, do parse the mesh on upload to check skeleton. Sooner or 
later this parsing needs to validate the model cost also.
 2014-10-11 22:41:59 +01:00
UbitUmarov
cc71dd9a27 dont let test mesh go to meshes inventory folder that is not displayed by 
viewers
 2014-10-11 11:12:43 +01:00
UbitUmarov
dab2e778d6 bug fix 2014-10-11 10:22:57 +01:00
UbitUmarov
1a6ef2d60e check for avatar skeleton data on meshs headers on cost estimation. Dont 
let a model have more than one mesh with skeleton, for testing create a
 mesh inventory item, for this meshs. Add also option to read a avatar
 collider replacement. This information still needs to be saved somewhere
 so it can be checked on attachment, etc, without parsing the mesh asset again.
 2014-10-11 10:01:26 +01:00
UbitUmarov
46caea6987 change it again... 2014-09-26 15:03:33 +01:00
UbitUmarov
90cad82405 remove unnecessary argument ref 2014-09-26 14:22:54 +01:00
UbitUmarov
fcad64209c make c# more happy 2014-09-26 14:17:01 +01:00
UbitUmarov
5f57b55dc9 use central animationset permitions define 2014-09-26 14:08:21 +01:00
Melanie Thielker
3a42ea5279 Extend upload verification to all upload paths 2014-09-25 21:21:20 +02:00
UbitUmarov
57166878b5 fix animation asset name to "animatn", use "animset" for the new 
animationSet
 2014-09-25 16:37:43 +01:00
UbitUmarov
f51779bb05 add also the name animset until its clear the name liru will use 2014-09-25 14:10:44 +01:00
UbitUmarov
18cc33e2c5 add animationset to upload assets, for now no cost 2014-09-25 13:35:30 +01:00
UbitUmarov
18de5c8a2d make use of it in GetMeshModule, and meshs are Assets not Task itens, 
reduce MeshModule impact on udp rate
 2014-08-29 16:30:49 +01:00
UbitUmarov
c84a3c3630 also on other case 2014-08-09 16:22:46 +01:00
UbitUmarov
601c50dc1e return even zero costs ( prims on other regions ) 2014-08-09 16:19:07 +01:00
UbitUmarov
2eb1c1c377 move from RegisterInventoryServiceHandlers to 
RegisterRegionServiceHandlers what belongs there ( readabilitly only )
 2014-08-09 15:15:27 +01:00
UbitUmarov
c3f9c99fb3 DANGER... changed bakedtextures caching. Assuming grid baking is cache 
only, reduced number of accesses to it. TESTING
 2014-08-07 05:20:45 +01:00
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
9f5e19127d comment out a debug msg. more on gods being Gods 2014-08-03 00:22:21 +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
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
Justin Clark-Casey (justincc)
a5ca15c428 Create regression test TestSendAgentGroupDataUpdate() for groups agent data sending 2013-12-18 23:35:38 +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
Melanie
91b70bf3fe Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
 2013-11-08 17:55:01 +00:00
Justin Clark-Casey (justincc)
50794c9008 minor: remove mono compiler warnings in AvatarPickerSearchModule and UploadBakedTextureModule 2013-10-31 23:51:01 +00:00
Melanie
69054ad134 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/VersionInfo.cs
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
 2013-10-06 18:32:20 +01:00
Justin Clark-Casey (justincc)
42bdf44658 Bump OPenSimulator version and assembly versions up to 0.8.0 Dev 2013-10-04 23:33:47 +01: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
Aleric Inglewood
2dc92e7de1 Preserve attachment point & position when attachment is rezzed in world 
Patch taken from
http://opensimulator.org/mantis/view.php?id=4905
originally by Greg C.

Fixed to apply to r/23314 commit
ba9daf849e
(cherry picked from commit 4ff9fbca441110cc2b93edc7286e0e9339e61cbe)
 2013-09-22 21:10:01 -05:00
Melanie
72206a0e29 Merge branch 'avination-current' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/Framework/Scenes/Tests/SceneObjectDeRezTests.cs
 2013-09-16 22:32:53 +01:00
Mic Bowman
b29e9d37e7 Change handling of the FetchInventoryDescendents2 capability configuration to allow 
for external handlers.
 2013-09-11 12:15:16 -07:00
root
823e8b5d19 Add support for simple external CAPS texture services 2013-09-07 17:57:02 +02: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
Justin Clark-Casey (justincc)
857f24a5e2 Fix bug where users teleporting to non-neighbour regions could continue to hear chat from their source region for some time after teleport completion. 
This occurs on v2 teleport since the source region now waits 15 secs before closing the old child agent, which could still receive chat.
This commit introduces a ScenePresenceState.PreClose which is set before the wait, so that ChatModule can check for ScenePresenceState.Running.
This was theoretically also an issue on v1 teleport but since the pause before close was only 2 secs there, it was not noticed.
 2013-09-02 19:15:10 +01:00
Melanie
bef03fb30b Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Services/Connectors/Neighbour/NeighbourServicesConnector.cs
 2013-08-17 03:23:45 +01:00
Justin Clark-Casey (justincc)
104626d732 minor: Comment out AvatarPicketSearch caps log message for now, which is occuring on every login and entity transfer 2013-08-14 23:22:52 +01:00