ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-11 03:45:35 +08:00
Code Issues Packages Projects Releases Wiki Activity
32,798 Commits 5 Branches 95 Tags
dotnet6
Commit Graph

589 Commits

Author SHA1 Message Date
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
Dan Lake
9f129938c9 Attachments module only registers when enabled. This enables alternative attachments module implementations. All calls to Scene.AttachmentsModule are checking for null. Ideally, if we support disabling attachments then we need a null attachments module to register with the scene. 2013-07-16 17:43:36 -07:00
Justin Clark-Casey (justincc)
e19defde36 Add "show caps stats by user" and "show caps stats by cap" console commands to print various counts of capability invocation by user and by cap 
This currently prints caps requests received and handled, so that overload of received compared to handled or deadlock can be detected.
This involves making BaseStreamHandler and BaseOutputStream record the ints, which means inheritors should subclass ProcessRequest() instead of Handle()
However, existing inheriting classes overriding Handle() will still work, albeit without stats recording.
"show caps" becomes "show caps list" to disambiguate between show caps commands
 2013-07-08 22:03:07 +01:00
Melanie
24a4367fc2 Merge branch 'avination-current' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
 2013-06-23 01:48:57 +01:00
Melanie
62c277ff9f Add a result param to te money module interface 2013-06-13 02:52:11 +02:00
Melanie
669fa3ff9a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
 2013-05-30 21:48:09 +01:00
Melanie
533bbf033d Update the money framework to allow sending the new style linden "serverside is now viewerside" messages regarding currency 
This will require all money modules to be refactored!
 2013-05-25 02:08:54 +01:00
Melanie
0086c3b5fb Update the money framework to allow sending the new style linden "serverside is now viewerside" messages regarding currency 
This will require all money modules to be refactored!
 2013-05-25 01:58:50 +02:00
Melanie
13cd8c17d7 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Services/LLLoginService/LLLoginResponse.cs
	OpenSim/Services/LLLoginService/LLLoginService.cs
	OpenSim/Tests/Common/Mock/TestClient.cs
 2013-05-11 02:35:26 +01:00
Justin Clark-Casey (justincc)
3290cd09d3 remove pointless region handle paramter from IClientAPI.SendKillObject() 2013-05-09 18:12:17 +01:00
Melanie
cdaceea5a6 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/IClientAPI.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
 2013-05-08 21:51:48 +01:00
Mic Bowman
33aaa40bee Adds an event and a method so that handling of the CachedTexture 
packet can be pulled out of LLClientView and moved to
AvatarFactory. The first pass at reusing textures (turned off by
default) is included. When reusing textures, if the baked textures
from a previous login are still in the asset service (which generally
means that they are in the simulator's cache) then the avatar will not
need to rebake. This is both a performance improvement (specifically
that an avatars baked textures do not need to be sent to other users
who have the old textures cached) and a resource improvement (don't
have to deal with duplicate bakes in the asset service cache).
 2013-05-08 13:13:51 -07:00
Melanie
7c729e1519 Merge branch 'master' into careminster 2013-04-29 00:38:20 +01:00
Melanie
cbb3bb62da Unbreak the sample money module 2013-04-27 17:56:39 +01:00
Melanie
ef08ab68a7 Small oversight in EconomyDataRequest - this would have affected everyone NOT using a money module. 2013-04-27 17:42:54 +01:00
Melanie
40036ca05f Change EconomyDataRequest signature to use an IClientAPI rather than UUID. This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID. 
Sending the reply requires having the IClientAPI.
 2013-04-25 21:37:40 +01:00
Melanie
fb8aa22084 Merge branch 'master' into careminster 2013-04-25 21:37:25 +01:00
Melanie
03c9d8ae4f Change EconomyDataRequest signature to use an IClientAPI rather than UUID. This is needed because recent LL viewer codebases call this earlier in login when the client is not yet established in the sim and can't be found by UUID. 
Sending the reply requires having the IClientAPI.
 2013-04-25 21:35:18 +01:00
Melanie
293a024c14 Allow callers to set the invoice parameter for GenericMessage 2013-04-22 22:39:08 +01:00
Melanie
6571e7ead2 Allow callers to set the invoice parameter for GenericMessage 2013-04-22 22:24:41 +02:00
Melanie
6ce9ed1a64 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
	OpenSim/Region/Framework/Scenes/ScenePresence.cs
 2013-03-23 23:01:55 +00:00
Justin Clark-Casey (justincc)
93206ef0fa Add "show borders" command to show the borders of a region. 
This is relevant to mega-regions where the borders are very different to a regular region.
Also adds some method doc and other code comments.
 2013-03-23 00:45:21 +00:00
Melanie
7bf33d333a Plumb the path from the client to the extra physics params and back 2013-02-07 22:25:28 +00:00
Melanie
e28c042dce Merge branch 'master' into careminster 2013-01-26 01:56:23 +00:00
Justin Clark-Casey (justincc)
d6d6618f62 minor: Call down to base OpenSimTestCase.SetUp() in NPCModuleTests to disable any enabled logging from previous tests 2013-01-26 00:28:45 +00:00
Justin Clark-Casey (justincc)
b914fb98c4 minor: remove mono compiler warning in SceneCommandsModule 2013-01-25 01:56:41 +00:00
Melanie
12efac494a Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/HttpServer/BaseHttpServer.cs
	OpenSim/Framework/Servers/HttpServer/PollServiceRequestManager.cs
	OpenSim/Region/Framework/Scenes/Animation/ScenePresenceAnimator.cs
 2013-01-19 02:38:04 +00:00
Justin Clark-Casey (justincc)
652cfa2ee2 Fix use of scene debug commands when region is set to root or a specific region where there is more than one region on the simulator. 2013-01-19 00:27:17 +00:00
Justin Clark-Casey (justincc)
115e1c2abb Add "debug set set animations true|false" region console command. 
Setting this logs extra information about animation add/remove, such as uuid and animation name
Unfortunately cannot be done per client yet
 2013-01-18 23:22:02 +00:00
Melanie
f74915ed4f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/Scene.cs
 2013-01-11 02:13:10 +00:00
Justin Clark-Casey (justincc)
26347307ec Fix a regression in the last few scene commands changes where setting these via the viewer estate dialog stopped working. 
Forgot to register the new interface.
Also removes some code which got included by adpating an existing module.
 2013-01-11 00:08:52 +00:00
Justin Clark-Casey (justincc)
f3a2bbbd93 Add "debug scene get" console command to list current scene options 2013-01-10 23:56:11 +00:00
Justin Clark-Casey (justincc)
a16ae5d7e3 Move scene debug commands into separate module. Command changes from "debug scene <key> <value>" to "debug scene set <key> <value>" to accomodate future settings 2013-01-10 23:49:48 +00:00
Melanie
083ac92b34 Merge branch 'avination' into careminster 2013-01-06 10:52:22 +00:00
Melanie
e62b14024f Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-01-04 22:39:07 +00:00
SignpostMarv
79b7c571ff updating documentation in SampleMoneyModule based on doxygen error log output; changing an xml-style hint to a uri-style hint in the class summary, improving documentation of Initialise method and removing a superfluous parameter, improving documentating of ClientClosed method and documenting an omitted parameter 2013-01-03 00:17:24 +00:00
teravus
77cc7ce399 * Partial Commit for Avatar Appearance to include the functionality of Cached Bakes. 2012-12-21 19:12:30 -05:00
Melanie
79bdf464d3 Merge branch 'avination' into careminster 2012-12-18 09:48:12 +00:00
Melanie
d3904ff484 Add a transaction ID to the money module path for llTransferLindenDollars 2012-12-03 19:34:22 +01:00
Melanie
fd7a83f439 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
	OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
 2012-11-25 14:13:50 +00:00
Justin Clark-Casey (justincc)
22d4c52ffc Consistenly make NUnit test cases inherit from OpenSimTestCase which automatically turns off any logging enabled between tests 2012-11-24 03:15:24 +00:00
Melanie
decc5318a7 Merge branch 'avination' into careminster 2012-11-20 01:21:15 +00:00
teravus
5e0294815f * Plumbing and basic setting of the GetMesh Cap Throttler. 
* Last step is to flip the throttle distribution.
 2012-11-17 03:47:09 -05:00
Melanie
7ad082f7c3 Merge branch 'avination' into careminster 2012-11-17 02:58:14 +00:00
teravus
e9153e1d1a Revert "Merge master into teravuswork", it should have been avination, not master. 
This reverts commit dfac269032, reversing
changes made to 619c39e514.
 2012-11-15 10:05:16 -05:00
teravus
dfac269032 Merge master into teravuswork 2012-11-15 09:46:41 -05:00
Melanie
06fa1681ae Merge branch 'master' into careminster 2012-11-15 00:43:26 +00:00
Diva Canto
18c5d33f0a All optional modules' directives moved out of addin.xml 2012-11-13 09:48:56 -08: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