ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-07-15 03:55:47 +08:00
Code Issues Packages Projects Releases Wiki Activity
23,461 Commits 5 Branches 86 Tags
bb841ea9cefb937c548646d366f689ef3bb80c61
Commit Graph

1187 Commits

Author SHA1 Message Date
Melanie Thielker
075cf2baa3 Remove the spammy "voice not enabled" message some viewers trigger in non voice parcels 2014-03-25 03:17:04 +01:00
Melanie
62c277ff9f Add a result param to te money module interface 2013-06-13 02:52:11 +02: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
296b43f597 Small adjustments to the floater module 2013-05-13 02:15:48 +02:00
Melanie
2332453974 Add RegionManager level and the ability to use literal XML to the dynamic floater module 2013-05-04 00:45:27 +02:00
Melanie
3fcac2ba7b Controller module for dynamic floaters (WIP) 2013-04-27 01:20:03 +02: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
3934b779b8 Adding the dynamic menu module which allows registering new menu options in compliant viewers 2013-04-25 01:39:22 +02:00
Melanie
6571e7ead2 Allow callers to set the invoice parameter for GenericMessage 2013-04-22 22:24:41 +02:00
Melanie
05810e48b0 Merge commit 'c92654fb43f303da8e1623f9fff8a404aad72374' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
 2013-03-29 02:15:47 +00:00
Justin Clark-Casey (justincc)
c92654fb43 Stop attempts to update/add existing attachments in user inventory when teleporting between regions. 
This appears to resolve issues on teleport where attachments disappear or become labelled as invalid within user inventory.
 2013-03-28 23:57:35 +00: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
36c57bac8e Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster 2013-03-26 03:26:28 +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
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
68b910c1ff Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
 2013-03-22 01:01:24 +00:00
Justin Clark-Casey (justincc)
c0ff5635ba Fix "show attachments" command probably broken in commit addab12 (Wed Jan 2 21:38:00 2013) 
This break was not connected with the recent attachment code changes.
 2013-03-20 02:00:56 +00:00
Melanie
5e1f651e21 Merge branch 'master' into newmultiattach 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2013-03-18 23:31:27 +00:00
Melanie
fcecfc81bb Multiattach, part 1 
Conflicts:

	OpenSim/Framework/AvatarAppearance.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
	OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
	OpenSim/Region/Framework/Scenes/Scene.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-03-18 22:56:03 +00:00
Melanie
b9146a7922 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/Servers/BaseOpenSimServer.cs
	OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
 2013-03-15 23:45:32 +00:00
Robert Adams
c10c43d6f6 Fix server statistics always reporting zero for total network bytes in/out. 
Clean up some parameter code in Statistics.Binary.
 2013-03-15 13:59:34 -07:00
Melanie
70f0587558 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
 2013-03-08 01:07:05 +00:00
Mic Bowman
9875e840f7 Per discussions with justincc... split the JsonStore type 
functions into one for node type and one for value type.
Define and export constants for both nodes and values.
 2013-03-05 20:33:17 -08:00
Melanie
339d8ef2a6 Merge branch 'avination' into careminster 
Conflicts:
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
 2013-03-06 00:15:54 +00:00
Melanie
81552f41c6 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/ClientStack/Linden/Caps/MeshUploadFlagModule.cs
	OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
	OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
	OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
 2013-03-05 23:57:53 +00:00
Melanie
797bfbfcfa Multiattach, part 1 2013-03-05 12:02:22 +01:00
Diva Canto
e70c71a175 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-03-02 17:54:19 -08:00
Diva Canto
b0985f7019 Fixed typos in TempAttachmentsModule. No changes. 2013-03-02 17:53:57 -08:00
Justin Clark-Casey (justincc)
1a98ce5f64 minor: Quieten down the parts of the WebSocketEcho module logging for now where it tells us it is added/loaded/removed from regions 2013-03-02 01:06:08 +00:00
Melanie
a675f7d4c3 Merge branch 'master' into careminster 2013-03-01 23:54:00 +00:00
Diva Canto
20530ee667 Moved permissions config vars out of [Startup] into [Permissions]. Backwards compatible ([Startup] still being looked up), but please update your configs sometime soon. 2013-03-01 15:24:22 -08:00
Justin Clark-Casey (justincc)
c851ebcd8c Add the Mono AddinDependency attribute to the example region modules. 
It turns out this is required to get Mono.Addins to pick up plugin DLLs
 2013-03-01 21:47:17 +00:00
Melanie
eb9458fd7e Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneManager.cs
 2013-02-28 21:20:07 +00:00
Justin Clark-Casey (justincc)
b892411575 Add comment to example region modules about need to add Assembly annotation if adding modules to a DLL which does not already have this 2013-02-27 22:54:51 +00:00
Melanie
578174d21c Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs
	OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
	OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
 2013-02-27 18:05:04 +00:00
Justin Clark-Casey (justincc)
80c19b7cac Make sure we dispose of WebResponse, StreamReader and Stream in various places where we were not already. 2013-02-27 00:21:02 +00:00
Melanie
54ee95dd8e Merge branch 'master' into careminster 2013-02-26 13:34:20 +00:00
Melanie
f4e12c5f72 Revert "Output some additional data on Vivox connection errors", this logs passwords! Bad! 
This reverts commit 79e477f6af.
 2013-02-24 18:33:47 +01:00
Melanie
79e477f6af Output some additional data on Vivox connection errors 2013-02-24 18:32:11 +01:00
Robert Adams
b2495c9a1e Streamline stat registration code in ServerStats. Remove most of the 
usage of ProcessCounters which tend to fail oddly and are not supported
everywhere.
 2013-02-24 07:48:01 -08:00
Robert Adams
8e67ad25b0 Addition of ServerStats shared region module which collects and registers 
server wide statistics (CPU%, network bytes sent, ...) with StatsManager.
 2013-02-24 07:47:59 -08:00
Melanie
9534d5f929 Merge branch 'master' into careminster 2013-02-22 01:28:54 +00:00
Justin Clark-Casey (justincc)
9de670c550 minor: Change summary in "show appearance" console command to "incomplete" rather than "corrupt" 
Corrupt is misleading - it implies textures were uploaded but are not j2k valid.
The actual situation is that at least one required baked texture is not present.
 2013-02-21 23:08:50 +00:00
Mic Bowman
903b40b47e Fix the JsonStore path set problem justincc found earlier today and 
remove the deprecated TestPath functions.
 2013-02-19 22:53:46 -08:00
Diva Canto
4779f7d7d5 Deleted all AssemblyFileVersion directives 2013-02-19 17:14:55 -08:00
Justin Clark-Casey (justincc)
26dca1adc3 Convert JsonTestPath() use in json regression tests to JsonGetPathType() instead 2013-02-19 23:53:57 +00:00
Justin Clark-Casey (justincc)
050ef1dc4e minor: Rename regression test method TestGetArrayLength() -> JsonTestGetArrayLength() to match others 2013-02-18 22:59:29 +00:00
Melanie
ea8c5ba707 Merge branch 'master' into careminster 
Conflicts:
	OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
 2013-02-15 21:42:16 +00:00
Justin Clark-Casey (justincc)
8d5fe5c222 Enable one sub-test in TestJsonSetValue() which now works (using identifier with embedded .). 
Need to look further at other still commented tests.
Still need to check coverage against some of Mic's scripts.
 2013-02-15 01:00:49 +00:00