ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-05-25 11:15:42 +08:00
Code Issues Packages Projects Releases Wiki Activity
19,579 Commits 5 Branches 93 Tags
26cd59cd6f874587743d56c8b5c55fdf61fd8749
Commit Graph

912 Commits

Author SHA1 Message Date
Justin Clark-Casey (justincc)
12a3b85561 Fix passing of voice distance attenuation to the Vivox voice server. 
Because of a typo, this wasn't being done at all - now the 'default' value as described in OpenSimDefaults.ini of 10m is passed (vivox_channel_clamping_distance)
Thanks to Ai Austin for spotting this.
 2013-05-30 22:20:02 +01:00
Diva Canto
233b9ec4d7 Merge branch 'master' of ssh://opensimulator.org/var/git/opensim 2013-05-28 20:59:54 -07:00
Diva Canto
7e1c7f54c7 First change in Vivox for ages! -- added a lock to serialize calls to vivox servers. This may ameliorate things when lots of avies arrive in a sim at about the same time. Turns out that there are 4 http requests per avie to Vivox. 2013-05-28 20:59:25 -07: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
Mic Bowman
681fbda4b6 This is an experimental patch that adds support for comparing texture 
hashes for the purpose of accurately responding to AgentTextureCached
packets. There is a change to IClientAPI to report the wearbles hashes
that come in through the SetAppearance packet. Added storage of the
texture hashes in the appearance. While these are added to the
Pack/Unpack (with support for missing values) routines (which means
Simian will store them properly), they are not currently persisted in
Robust.
 2013-05-24 13:18:16 -07:00
Justin Clark-Casey (justincc)
3290cd09d3 remove pointless region handle paramter from IClientAPI.SendKillObject() 2013-05-09 18:12:17 +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
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
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
5d0a8ff391 Change copyright notice on DynamicMenuModule to proper BSD 2013-04-25 20:48:12 +01:00
Melanie
ec4f981f1d Adding the dynamic menu module which allows registering new menu options in compliant viewers 2013-04-25 01:52:34 +01:00
Justin Clark-Casey (justincc)
115e0aaf83 Fix issue in ConciergeModule where UpdateBroker was sending malformed XML if any number of avatars other than 1 was in the region. 
I don't know how well the rest of ConiergeModule works since I've practically never looked at this code.
Addresses http://opensimulator.org/mantis/view.php?id=6605
 2013-04-23 21:55:51 +01:00
Melanie
293a024c14 Allow callers to set the invoice parameter for GenericMessage 2013-04-22 22:39:08 +01:00
dahlia
69f07fdb34 Materials persistence via SceneObjectPart.dynAttrs. This appears to work across region restarts and taking objects into inventory, but probably will not work across archiving via OAR or IAR as materials texture assets may not be adequately referenced to trigger archiving. 2013-04-20 23:39:07 -07:00
dahlia
233f761779 handle PUT verb for RenderMaterials Cap 2013-04-20 02:08:22 -07:00
dahlia
258804cc04 RenderMaterials POST Cap now return material entries when invoked with an OSDArray of MaterialIDs 2013-04-19 22:19:57 -07:00
dahlia
06829c4082 remove default parameter value that apparently mono cant handle 2013-04-18 01:29:50 -07:00
dahlia
d5419f0a46 Initial experimental support for materials-capable viewers. This is in a very early stage and this module is disabled by default and should only be used by developers for testing as this module could cause data corruption and/or viewer crashes. No materials are persisted yet. 2013-04-18 01:03:19 -07: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
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
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
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
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
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
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
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
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
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
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
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
Justin Clark-Casey (justincc)
61f18d15e1 Rename JsonSetValueJson() -> JsonSetJson() and JsonGetValueJson() -> JsonGetJson() 
This is because JsonGetJson() is getting json from anywhere in the structure, not just values.
Equally, JsonSetJson() is setting any type of json, not just json which represents a value.
Agreed with cmickeyb
 2013-02-15 00:38:07 +00:00
Justin Clark-Casey (justincc)
0b2608d8f4 Comment out regression TestJsonTestPath and TestJsonTestPathJson as these will go away soon 2013-02-15 00:32:20 +00:00
Justin Clark-Casey (justincc)
cc40517863 Add regression TestJsonList2Path() 2013-02-15 00:27:30 +00:00
Justin Clark-Casey (justincc)
13d4f6f747 Add regression TestGetArrayLength() 2013-02-14 21:34:57 +00:00
Justin Clark-Casey (justincc)
6fe771f27e Add regression TestJsonGetPathType() 2013-02-14 21:31:34 +00:00
Justin Clark-Casey (justincc)
edb99dcc19 Rename new JsonScript functions JsonPathType() -> JsonGetPathType() and JsonArrayLength() -> JsonGetArrayLength() 
This is for consistentency with the verb:noun naming approach existing json script functions and other script functions.
Corresponding c# methods also changed since verb:noun is also the .net c# method naming guideline (as used by OpenSimulator) and for consistency with script functions.
As agreed with cmickeyb
 2013-02-14 21:11:58 +00:00
Justin Clark-Casey (justincc)
a52dfd43b6 Make new JsonStore script constants separated with underscores, to be consistent with existing LSL/OSSL, etc script constants. 
Agreed with cmickeyb
 2013-02-14 21:03:07 +00:00
Mic Bowman
bcb172301d Adds a couple requested functions to the JsonStore script 
interface. JsonPathType returns the type of node pointed to by the
path and deprecates the functionality of both JsonTestPath
functions. JsonArrayLength returns the length of an array node.
 2013-02-13 07:14:04 -08:00