ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 20:05:33 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,391 Commits 5 Branches 95 Tags
Mono-Net4X
Commit Graph

218 Commits

Author SHA1 Message Date
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
Justin Clark-Casey (justincc)
c496bd57b4 minor: Comment out received seed caps request logging for now 2014-10-02 22:33:58 +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
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
Oren Hurvitz
9fa8d84598 Eliminated some warnings 2014-07-21 08:30:10 +01:00
Justin Clark-Casey (justincc)
4b73268cbd minor: put standard 'category' in brackets at front of log messages from previous commit 3d70db4a 2014-07-04 23:48:37 +01:00
Latif Khalifa
3d70db4a58 When uploading mesh objects with textures also create inventory items for uploaded textures. 
This implements:
http://opensimulator.org/mantis/view.php?id=7250
 2014-07-04 23:40:09 +01:00
Oren Hurvitz
1e5cff32fc Show more meaningful error messages when failed to give an item to another user 2014-05-06 07:28:44 +01:00
Oren Hurvitz
06e4fcd260 Fixed the UpdateAgentInformation CAP: the viewer expects the simulator to echo back the maturity that it sent 
Without this change, attempts to change the maturity rating in the viewer's Preferences don't work.
 2014-04-29 07:59:10 +01: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
a7eb1b5b85 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
 2013-07-24 03:50:09 +01:00
Melanie
7830cc9954 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ClientStack/Linden/Caps/UploadBakedTextureModule.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
	OpenSim/Region/CoreModules/Framework/Caps/CapabilitiesModule.cs
	OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
	OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/Framework/Scenes/SceneCommunicationService.cs
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/SensorRepeat.cs
	OpenSim/Server/Handlers/Simulation/AgentHandlers.cs
	OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
	OpenSim/Services/Connectors/Simulation/SimulationServiceConnector.cs
	OpenSim/Services/HypergridService/UserAgentService.cs
 2013-07-18 10:08:10 +01:00
Justin Clark-Casey (justincc)
1b7b664c86 Add request received/handling stats for caps which are served by http poll handlers. 
This adds explicit cap poll handler supporting to the Caps classes rather than relying on callers to do the complicated coding.
Other refactoring was required to get logic into the right places to support this.
 2013-07-15 23:27:46 +01:00
Justin Clark-Casey (justincc)
013710168b For stat purposes, add names to capability request handlers where these were not set 2013-07-08 22:39:07 +01:00
Melanie
745a209bf2 Explicitly set uploaded mesh object perms 2013-06-10 01:16:22 +02:00
Melanie
ac135c649c Fix CAPS to work like they should - do not send caps to the viewer if they're not in the requested caps list. 
The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail
on all viewers when turned off. UDB inventory would not be correctly used in
that case.
 2013-04-30 23:50:23 +01:00
Melanie
0af1d8fe19 Fix CAPS to work like they should - do not send caps to the viewer if they're not in the requested caps list. 
The previous wrong behavior caused the debug setting "UseHTTPInventory" to fail
on all viewers when turned off. UDB inventory would not be correctly used in
that case.
 2013-04-30 23:35:59 +02:00
Melanie
5f4c4df227 Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask 
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
 2013-03-26 03:40:06 +00:00
Melanie
c341664c1b Phase 1 of implementing a transfer permission. Overwrite libOMV's PermissionMask 
with our own and add export permissions as well as a new definition for "All" as meaning "all conventional permissions" rather than "all possible permissions"
 2013-03-24 18:56:28 +01:00
Melanie
f39e4abf0e Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
 2013-03-03 13:24:37 +00:00
Melanie
9534d5f929 Merge branch 'master' into careminster 2013-02-22 01:28:54 +00:00
Justin Clark-Casey (justincc)
8a6f2432fc minor: remove some mono compiler warnings in OpenSim.Region.ClientStack.Linden.Caps.dll 2013-02-20 00:01:20 +00:00
Melanie
8c0b9080a4 Fix an issue where the viewer would request the seed cap before 
there was a handler for it.
 2013-02-18 21:09:14 +01:00
Melanie
338b02a8bc Send the new physics params to the viewer build dialog 2013-02-07 21:23:35 +00:00
Melanie
bbda7b94b3 Rename Bounciness to Restitution 2013-02-07 21:25:55 +00:00
Melanie
6aa876a83b Rename Bounciness to Restitution 2013-02-07 03:40:48 +00:00
teravus
2104e4d4d4 * the root prim was being given an OffsetPosition in addition to setting the position when creating the root prim. The offset position caused the positioning code to re-move the root prim when you selected it and released it. 2013-02-05 18:46:02 -05:00
Melanie
2163bebeb4 Try to fix uploaded mesh rotations - code from Avination code base. 2013-02-05 20:09:02 +00:00
Melanie
3a495ccd56 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
	OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
 2013-01-10 01:38:03 +00:00
Melanie
2ac96dd181 Add the new UpdateAgentInformation cap to make maturity on more recent viewers 
work.
 2013-01-08 22:52:14 +00:00
Melanie
0a393b317d Add the new UpdateAgentInformation cap to make maturity on more recent viewers 
work.
 2013-01-08 22:32:39 +01:00
Melanie
9a5679876e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/GetTextureModule.cs
	OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
 2012-11-13 02:10:09 +00:00
Diva Canto
86903f23dd Cleanup on region modules: gave short node id's to all of them. 2012-11-12 18:08:02 -08:00
Melanie
72c925a6c9 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Framework/WebUtil.cs
	OpenSim/Region/Physics/OdePlugin/OdeScene.cs
 2012-10-18 20:56:34 +01:00
Melanie
2e8e8d576e Remove redundant and annoyingly modal message box in upload processing. 2012-10-18 13:20:50 +02:00
Melanie
fa52effb27 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Services/Connectors/Friends/FriendsSimConnector.cs
 2012-10-16 04:30:01 +01:00
Justin Clark-Casey (justincc)
3ac6a423f7 minor: comment out "Registered seed capability" message for "Received SEED caps request" message for now. 
I think this is more useful right now since it tells us if the viewer requested a seed caps at all in various scenarios (such as when teleporting to a new region).
 2012-10-16 00:54:25 +01:00
Melanie
421071bd8a Text changes for upload messages 2012-09-24 23:19:57 +02:00
UbitUmarov
a1a0a90720 more upload changes (plus untouch prebuild.xml) 2012-09-24 22:57:33 +01:00