b0985f7019
Fixed typos in TempAttachmentsModule. No changes.
2013-03-02 17:53:57 -08:00
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
a675f7d4c3
Merge branch 'master' into careminster
2013-03-01 23:54:00 +00:00
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
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
eb9458fd7e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneManager.cs
2013-02-28 21:20:07 +00:00
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
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
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
54ee95dd8e
Merge branch 'master' into careminster
2013-02-26 13:34:20 +00:00
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
79e477f6af
Output some additional data on Vivox connection errors
2013-02-24 18:32:11 +01:00
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
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
9534d5f929
Merge branch 'master' into careminster
2013-02-22 01:28:54 +00:00
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
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
4779f7d7d5
Deleted all AssemblyFileVersion directives
2013-02-19 17:14:55 -08:00
26dca1adc3
Convert JsonTestPath() use in json regression tests to JsonGetPathType() instead
2013-02-19 23:53:57 +00:00
050ef1dc4e
minor: Rename regression test method TestGetArrayLength() -> JsonTestGetArrayLength() to match others
2013-02-18 22:59:29 +00:00
ea8c5ba707
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-02-15 21:42:16 +00:00
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
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
0b2608d8f4
Comment out regression TestJsonTestPath and TestJsonTestPathJson as these will go away soon
2013-02-15 00:32:20 +00:00
cc40517863
Add regression TestJsonList2Path()
2013-02-15 00:27:30 +00:00
13d4f6f747
Add regression TestGetArrayLength()
2013-02-14 21:34:57 +00:00
6fe771f27e
Add regression TestJsonGetPathType()
2013-02-14 21:31:34 +00:00
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
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
9d55a2298d
Merge branch 'master' into careminster
2013-02-14 07:45:23 +00:00
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
708c3f8b86
Make path parsing more robust in the JsonStore.
2013-02-12 23:21:49 -08:00
d0c5e0990b
Merge branch 'master' into careminster
2013-02-13 01:54:06 +00:00
5557b523fd
Add more sub-tests to TestJsonSetValue for paths containing []{} without {} delineation.
...
As expected, values are not set and the set call returns FALSE (0).
As a reminder, these tests are not currently running on jenkins continuous integration as the functionality is only available on .net 4 (mono 2.8 and later).
2013-02-13 01:38:33 +00:00
b1a165a39a
Extend JsonTestSetValue() with tests for escaping brackets, periods and unbalanced braces from paths
...
The sub-tests that are commented out are currently those which fail unexpectedly based on my understanding of the path syntax
2013-02-13 01:25:30 +00:00
70e641c708
Add test for array as root element in TestJsonCreateStore()
2013-02-13 00:51:45 +00:00
4b797f2ead
Extend TestJsonRemoveValue() with tests for non-penultimate nodes and arrays
2013-02-13 00:12:20 +00:00
467e8d56b5
Merge branch 'master' into careminster
2013-02-12 23:21:26 +00:00
992ef9e971
Extend TestJsonCreateStore() with a one key input and an input with raw number values
2013-02-12 23:00:24 +00:00
058d477ce7
Re-enable subtest for single quoted token in TestJsonSetValueJson()
...
This is in response to the resolution of http://opensimulator.org/mantis/view.php?id=6540
2013-02-12 20:51:36 +00:00
4b8c22ecfa
Adds the parameter for OSD serialization to encode default values. This
...
makes the JsonStore get/set operations symmetric.
2013-02-12 11:10:17 -08:00
d3b2cdc2b4
Fix handling of string values in JsonSetValueJson(). There are
...
some oddities with empty strings: the Json serializer treats them
as default values and does not return them in serialized hashes.
2013-02-11 19:55:10 -08:00
586def0bcc
Add regression TestJsonSetValueJson()
...
The part to test setting of single leaf-node string tokens is currently commented out.
See http://opensimulator.org/mantis/view.php?id=6540
2013-02-12 01:27:38 +00:00
d55974bcb7
Add regression TestJsonGetValueJson()
2013-02-11 23:47:49 +00:00
6924bd21f4
Add regression TestJsonTestPathJson()
2013-02-11 23:10:07 +00:00
9d001e40e7
Add section to TestJsonGetValue() to test call on a sub-tree
2013-02-11 22:56:43 +00:00
8fcfd82241
Extend TestJsonTestPath() for non-terminating section of path (i.e. one that does not point to a value/leaf)
2013-02-11 22:44:25 +00:00
cbb8d82c7d
Add section to TestJsonSetValue() to test attempted set of value where the penultimate section of path does not exist
2013-02-11 22:28:50 +00:00
c72c189864
Add test to try reading notecard into an invalid path in TestJsonReadNotecard() regression test
2013-02-11 22:16:07 +00:00
069e587841
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
2013-02-10 00:17:14 +00:00
0a297a0e52
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-08 22:43:56 -08:00
7bb82c8f2e
Make JsonStore path parsing more robust. Should fix the
...
invalid path problem.
2013-02-08 22:43:15 -08:00
6935bec0ab
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-09 01:11:41 +00:00
a8bc08ebe6
Change TestDestroyStore() and TestJsonRemoveValue() to reflect the fact that the return values have changed.
2013-02-09 01:10:53 +00:00
1b55a9d81e
BulletSim: fix avatar bobbing or jiggling while stationary flying.
...
Various comments and debugging message mods.
2013-02-08 16:29:40 -08:00
d92eb80373
BulletSim: add initial instance of the ExtendedPhysics region module which adds new LSL commands for extended physics functions. Uses the modInvoke system. Disabled by default.
2013-02-08 16:29:35 -08:00
6d825d7ea2
Broaden the internal OSD type checks to parse JSON that has
...
non string values.
2013-02-08 15:46:42 -08:00
12971e73d4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
2013-02-08 23:29:47 +00:00
e93defd0ca
Adds size limits to JsonStore. Adds a separate configuration
...
variable to enable binding to dynamic attributes.
2013-02-08 15:07:43 -08:00
2b5eba9c74
Fix the return values for JsonDestroyStore, JsonRemoveValue, and JsonSetValue.
...
Fix the link message status when reading a notecard.
2013-02-08 12:00:16 -08:00
42f724f380
Refine TestJsonReadNotecard() and use / instead of . to separate paths.
...
An attack of the stupid meant that I was using / as a path separator.
Fixing this makes the tests behave better, though still with some questions.
Also, I imagine / shouldn't really put data in the root as that's not a valid identifier.
This commit also fix the / mistake in other tests those this does not affect their outcomes.
2013-02-08 01:59:27 +00:00
528f23beab
Extend TestJsonReadNotecard() for reads to non-root locations and fake stores.
...
Assertions for loading to non-root paths are currently commented out because this doesn't seem to be working. Will be raising mantis to resolve.
2013-02-08 01:02:25 +00:00
8a2604f17e
Merge branch 'master' into careminster
2013-02-08 00:48:37 +00:00
9c9b48b29a
Stop wrongly create a receiving store already populated with "Hello":"World" in TestJsonReadNotecard()
2013-02-08 00:38:30 +00:00
24bfdbfb80
Extend TestJsonWriteNotecard() regression test for cases with fake paths and fake stores.
...
Also separates out TestJsonWriteReadNotecard() into separate write and read tests
2013-02-08 00:36:20 +00:00
bef8961578
Extend TestJsonSetValue() regressio ntes tto test against a fake store
2013-02-08 00:04:05 +00:00
be982666fb
Extend TestJsonTestPath() regression test with checks against fake values and fake stores
2013-02-08 00:01:06 +00:00
75f1e04315
Add tests for removing fake values/from fake store in TestJsonRemoveValue()
...
Again, need to check if returning true for removing a value that doesn't exist is most appropriate.
2013-02-07 23:58:19 +00:00
715d6f2da1
Add testing for getting non-existing values and values from a non-existing datastore to TestJsonGetValue()
2013-02-07 23:52:28 +00:00
ef86a9be45
Merge branch 'master' into careminster
2013-02-07 23:23:53 +00:00
2e86978b60
Add TestJsonDestoreStoreNotExists()
...
This still returns true even if we ask to destroy a store that does not exist.
Need to check that this is more appropriate behaviour.
2013-02-07 23:30:03 +00:00
9e17dc3daa
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-07 23:09:47 +00:00
c135c3224f
Fix a recent regression in e17392a where JsonSetValue() stopped working (probably other functions as well).
...
Fix is to call through to the no-arg constructor from the string constructor in JsonStore, which I suspect was just forgotten.
This was actually picked up by the TestJsonSetValue() regression test failing
But this isn't being run on jenkins due to the .net version issue.
This commit also puts the full stack trace in logged messages and makes these error level messages instead of info
2013-02-07 23:08:19 +00:00
7bf33d333a
Plumb the path from the client to the extra physics params and back
2013-02-07 22:25:28 +00:00
45f5a6a6db
Merge branch 'master' into careminster
...
Conflicts:
bin/HttpServer_OpenSim.dll
2013-02-07 20:51:51 +00:00
af73ea909c
Change passed PhysicsParameter value from float to the more general string value
2013-02-07 11:10:14 -08:00
a5c83f7505
Websocket Echo module should not be on by default.
2013-02-07 12:22:03 -05:00
4bd1794b5a
* missing example module.. Oops.
2013-02-07 12:19:54 -05:00
529489e73a
Merge branch 'master' into careminster
2013-02-07 03:20:16 +00:00
2c5d24d394
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2013-02-07 02:19:53 +00:00
3657a08844
Add TestJsonWriteReadNotecard() regression test
2013-02-07 02:19:26 +00:00
375114bea3
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-02-07 01:40:11 +00:00
e17392acbb
Enables script access to the per object dynamic attributes through the JsonStore
...
script functions. Adds JsonAttachObjectStore to associate a store identifier with
an object (scripts can only access the store in their host object, this could be
extended but isn't necessary for now).
Note this opens a method to the DAMap OSDMap. This will be removed later, but
greatly simplifies the code for now.
The JsonStore and these scripts are disabled by default.
2013-02-06 17:29:17 -08:00
4d1758985f
Make json store tests operate on a single thread to ensure we don't run into any race related test failures in the future.
2013-02-07 00:54:09 +00:00
f567ff9f51
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Physics/BulletSPlugin/BSShapeCollection.cs
2013-02-06 02:22:12 +00:00
eddfed3812
Allow JsonReadNotecard() to accept the name of the notecard as well as the asset ID.
...
Agreed in discussion with cmickeyb.
This is to make this consistent with similar existing LSL/OSSL functions such as llTriggerSound() and osNpcLoadAppearance() that allow an item name or an asset id.
2013-02-06 01:37:22 +00:00
d3892bbd06
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Framework/Servers/VersionInfo.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2013-02-05 21:30:12 +00:00
1f1da23097
Bump version and assembly version numbers from 0.7.5 to 0.7.6
...
This is mostly Bluewall's work but I am also bumping the general version number
OpenSimulator 0.7.5 remains in the release candidate stage.
I'm doing this because master is significantly adding things that will not be in 0.7.5
This update should not cause issues with existing external binary DLLs because our DLLs do not have strong names
and so the exact version match requirement is not in force.
2013-02-05 00:23:17 +00:00
7482ad1c22
Merge branch 'master' into careminster
2013-02-04 19:21:39 +00:00
1e0420431f
Move the JsonStore regular expressions to static variables to avoid
...
recompiling on every operation. Added JsonList2Path script function
to simplify array iteration.
2013-01-31 14:53:16 -08:00
9a4de546fe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
2013-01-31 02:53:11 +00:00
a0ef3df194
Add JsonTestStore to determine if a JsonStore is associated with
...
a particular UUID.
2013-01-30 14:45:03 -08:00
d42c7afe3f
Add JsonDestroyStore() basic regression test
2013-01-30 05:56:30 +00:00
5a22efe69c
refactor: Make invocations of json store functions from the regression test simpler
2013-01-30 05:49:28 +00:00
addf9ada49
Add regression test for script func JsonRemoveValue()
2013-01-30 05:39:34 +00:00
39700445f2
minor: change name of json script tests to JsonStoreScriptModuleTests instead of copy/pasted LSL_ApiInventoryTests
2013-01-29 04:36:41 +00:00
e0f4e91d22
Try ignoring json tests if they can't be run due to being on <=.net 3.5
2013-01-29 04:26:47 +00:00
e28c042dce
Merge branch 'master' into careminster
2013-01-26 01:56:23 +00:00
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
d977bb77cb
Disable json tests for now - I see this is failing on jenkins because mono 2.4.3 doesn't have Funcs >5 params, though mono 2.6 onwards does.
...
Standardize logging in JsonStoreScriptModule and some minor code formatting.
2013-01-25 03:19:56 +00:00
614d4eda3e
See if getting the registering JsonReadNotecard with MethodInfo works around an apparent issue with registering methods with more than 5 parameters on mono 2.4.3
2013-01-25 03:02:08 +00:00
4f52acaa83
Increase logging by enabling during test setup rather than during individual tests of for JsonStore
2013-01-25 02:32:38 +00:00
8c68451856
Enable logging in new json store tests to find out why they fail on jenkins but not locally.
2013-01-25 02:22:24 +00:00
844e60da0f
Add JsonTestPath() regression test
2013-01-25 02:12:28 +00:00
f32361d595
Add regression test for JsonSetValue()
2013-01-25 02:08:33 +00:00
b914fb98c4
minor: remove mono compiler warning in SceneCommandsModule
2013-01-25 01:56:41 +00:00
ba369c5cfe
Add basic JsonGetValue() regression test.
2013-01-25 01:55:27 +00:00
f557d7e828
Add basic JsonCreateStore() regression test
2013-01-25 01:48:31 +00:00
cc4cfd9fa8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Physics/BulletSNPlugin/BSShapeCollection.cs
2013-01-23 02:38:59 +00:00
9c590e51b6
IRCBridgeModule: optional agent-alertbox for IRC enabled Regions look in OpenSimDefaults.ini / section [IRC]
...
http://opensimulator.org/mantis/view.php?id=6470
idea: https://github.com/ssm2017/IrcBridgeAlert
2013-01-19 02:40:28 +00:00
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
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
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
f74915ed4f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2013-01-11 02:13:10 +00:00
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
f3a2bbbd93
Add "debug scene get" console command to list current scene options
2013-01-10 23:56:11 +00:00
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
17f21ba9a0
minor: Capitalize GroupsModule command category
2013-01-10 22:46:25 +00:00
083ac92b34
Merge branch 'avination' into careminster
2013-01-06 10:52:22 +00:00
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
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
8f31649fad
Fix indenting on ConsoleDisplayTable, align indenting on "show animations" console command
2013-01-02 22:37:50 +00:00
6b55f51837
minor: Allow objects to be added directly to a row on a ConsoleDisplayTable rather than having to ToString() them first
2013-01-02 22:11:13 +00:00
addab1244e
Add "show animations" console command for debug purposes.
...
This shows the current animation sequence and default anims for avatars.
2013-01-02 21:38:00 +00:00
7943c8d11c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2013-01-02 11:52:37 +00:00
26f364cc5d
Comment out test messages that go directly to the console.
2012-12-31 19:57:20 -08:00
77cc7ce399
* Partial Commit for Avatar Appearance to include the functionality of Cached Bakes.
2012-12-21 19:12:30 -05:00
79bdf464d3
Merge branch 'avination' into careminster
2012-12-18 09:48:12 +00:00
93bede4e6a
revert the use of avatar skeleton and use avatar size provided by viewers,
...
since at least for now seems good enought
2012-12-07 21:26:58 +00:00
5837e731bf
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/InstantMessage/OfflineMessageModule.cs
2012-12-04 23:01:18 +00:00
ac65085cc3
XmlRpcGridRouter
...
Flesh out XmlRpcGridRouter to reap unused channels from gateway when scripts or objects are removed, or when the llCloseRemoteDataChannel is called.
See: http://http://forge.opensimulator.org/gf/project/xmlrpcrouter/ or
https://github.com/BlueWall/XmlRpcRouter
for php gateway and test code.
2012-12-03 20:16:44 -05:00
d3904ff484
Add a transaction ID to the money module path for llTransferLindenDollars
2012-12-03 19:34:22 +01:00
cf670c01cc
Merge branch 'avination' into careminster
2012-11-25 14:14:20 +00:00
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
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
82690e1384
Fix bug where loading an OAR with a deeded parcel would always set the parcel owner ID to the estate owner even if the group UUID was present.
...
Aims to address http://opensimulator.org/mantis/view.php?id=6355
As part of this work, an incomplete IXGroupsData was added which currently only allows store/fetch/delete of group records
(i.e. no membership data etc)
This is subject to change and currently only an in-memory storage implementation exists for regression test purposes.
2012-11-24 02:43:31 +00:00
edb3a9596b
Remove a superfluous newline from help
2012-11-23 03:31:44 +01:00
decc5318a7
Merge branch 'avination' into careminster
2012-11-20 01:21:15 +00:00
0bf66434bc
Merge branch 'teravuswork' into avination
2012-11-20 00:48:13 +01:00
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
7ad082f7c3
Merge branch 'avination' into careminster
2012-11-17 02:58:14 +00:00
e9153e1d1a
Revert "Merge master into teravuswork", it should have been avination, not master.
...
This reverts commit dfac269032619c39e514
2012-11-15 10:05:16 -05:00
dfac269032
Merge master into teravuswork
2012-11-15 09:46:41 -05:00
06fa1681ae
Merge branch 'master' into careminster
2012-11-15 00:43:26 +00:00
790b595aa0
Added a few more AssemblyInfos. (Plus added the one in OptionalModules, which had been forgotten.)
2012-11-13 19:50:19 -08:00
1f9d39c15d
Deleted OptionalModules.addin.xml. Added AssemblyInfo.cs for that dll.
2012-11-13 09:54:52 -08:00
18c5d33f0a
All optional modules' directives moved out of addin.xml
2012-11-13 09:48:56 -08:00
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
86903f23dd
Cleanup on region modules: gave short node id's to all of them.
2012-11-12 18:08:02 -08:00
2e0ce70e63
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/ClientStack/Linden/Caps/NewFileAgentInventoryVariablePriceModule.cs
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
OpenSim/Region/Framework/ModuleLoader.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
2012-11-12 23:27:47 +00:00
0d15a6a01f
Remove any mention of IRegionModule from region names and comments to aid
...
grepping for remaining uses
2012-11-12 19:18:20 +00:00
d9b149b375
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/World/Permissions/PermissionsModule.cs
OpenSim/Region/OptionalModules/Scripting/XmlRpcRouterModule/XmlRpcRouterModule.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-11-12 15:46:45 +00:00
64fad2f80e
Two more modules converted: XmlRpcGridRouterModule and XmlRpcRouterModule.
2012-11-11 16:44:59 -08:00
4e8c8b2cd8
One more module converted: MRMModule.
2012-11-11 16:18:47 -08:00
abef034d1b
One more module converted: IRCStackModule.
2012-11-11 16:10:47 -08:00
f560d581bb
document & 80-character width terminal formatting
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-11 13:50:38 -08:00
23605cf93d
converting NPC module to ISharedRegionModule
...
Signed-off-by: Diva Canto <diva@metaverseink.com>
2012-11-11 13:50:38 -08:00
389077345f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Gods/GodsModule.cs
OpenSim/Region/CoreModules/Scripting/WorldComm/WorldCommModule.cs
OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
2012-11-11 16:31:01 +00:00
a4fee98352
One more module converted: TreePopulator.
2012-11-09 22:09:08 -08:00
5cbf7b3997
Merge branch 'ubitwork' into avination
2012-11-06 11:32:53 +01:00
4fa088bafb
Pipe Throttle Update Event to EventManager, client --> ScenePresence --> EventManager, so that modules can know when throttles are updated. The event contains no client specific data to preserve the possibility of 'multiple clients' and you must still call ControllingClient.GetThrottlesPacked(f) to see what the throttles actually are once the event fires. Hook EventManager.OnUpdateThrottle to GetTextureModule.
2012-11-04 22:57:24 -05:00
7e91a787fb
Add a method to query all registered script constants to allow non-XEngine
...
script engines to use them.
2012-11-04 22:01:34 +01:00
1090ff7278
removed potencial null refs and rearrange code a bit
2012-11-04 14:57:27 +00:00
48569e856a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-10-30 01:02:20 +00:00
c5af16aef8
shuffling code around so that the interface for ISoundModule.SendSound() specifies a UUID rather than a string
2012-10-29 23:39:00 +00:00
5abcecc735
moving SendSound from SceneObjectPart to ISoundModule
2012-10-29 23:39:00 +00:00
09f4e72d6a
Fix memory leak where removing an NPC did not remove its circuits.
...
This was because we were removing by circuitcode where NPCs have no code.
Now removing by agent ID instead.
This commit also fixes the "show circuits" console command to work properly where the circuit has no associated IP address.
2012-10-29 23:22:40 +00:00
26cc57b6ca
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Chat/ChatModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Constants.cs
2012-10-26 21:13:01 +01:00
c13a99dc5c
Fix script error messages not showing up in viewer 3 and associated viewers.
...
Viewer 3 will discard such a message if the chat message owner does not match the avatar.
We were filling the ownerID with the primID, so this never matched, hence viewer 3 did not see any script error messages.
This commit fills the ownerID in with the prim ownerID so the script owner will receive script error messages.
This does not affect viewer 1 and associated viewers which continue to process script errors as normal.
2012-10-25 03:26:12 +01:00
f76dceb90b
Get "save oar" and "save iar" to tell you in a more friendly manner if the filename to save already exists, rather than exception throwing.
...
Also changes ConsoleUtil.CheckFileExists to CheckFileDoesNotExist() since this is more meaningful in the context, even though it does result in double negatives.
2012-10-24 03:08:58 +01:00
6ad8d3c43f
Merge branch 'master' into careminster
2012-10-20 02:33:24 +01:00
1937e5f1ec
Relocate temporary debug message for sending group IMs to online members only so that we can add ms it takes to send.
...
This is chiefly to assess how long it may still take to send messages to such filtered groups.
2012-10-20 02:13:00 +01:00
cd3762ca9f
Add experimental [Groups] MessageOnlineUsersOnly option for Flotsam XmlRpc groups.
...
This retrieves and caches information from the PresenceService to only send messages to online users.
This is reported to much improve performance for large groups where most users are offline.
Cache is 20 seconds to balance requests against users not receiving messages until cache updates.
This is an alternative to an approach where login/logout notification is sent directly from simulator to groups service.
However, I'm not convinced that this PresenceService approach is actually better. Needs more thought.
2012-10-20 01:26:04 +01:00
6cca713679
Fix build break from commit e469879
2012-10-20 01:08:52 +01:00
e469879725
Add "debug groups verbose <true|false>" region console command
...
This allows one to turn on super-verbose groups debug logging on and off whilst the region is in operation.
2012-10-19 23:45:55 +01:00
f7dcd33008
minor: Increase attachment name field from 36 to 50 chars in "attachments show" report
2012-10-19 03:12:58 +01:00
f7df68d922
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Lure/LureModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Services/Connectors/Asset/AssetServicesConnector.cs
2012-10-07 02:48:28 +01:00
16c9c1dff7
On receiving TaskInventoryAccepted with a destination folder in the binary bucket slot for RLV, notify the viewer about inventory folder updates.
...
The viewer would not see the folder move without this, either on accept or decline.
This commit also updates the TaskInventoryOffered message to better conform with the data LL uses
Changes are, agentID is prim owner rather than prim id, agent name is now simply object name rather than name with owner detail,
message is just folder name in single quotes, message is not timestamped.
However, folder is not renamed "still #RLV/~<name>". Long term solution is probably not to do these operations server-side.
Notes will be added to http://opensimulator.org/mantis/view.php?id=6311
2012-10-06 02:34:49 +01:00
91a5c602e3
Revert "Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow ."
...
But the patch is here, in case anyone wants to try it.
This reverts commit 531edd51d8
2012-09-30 07:48:03 -07:00
531edd51d8
Added request.Proxy=null everywhere, as discussed in http://stackoverflow.com/questions/2519655/httpwebrequest-is-extremely-slow .
...
Thanks R.Gunther (rigun@rigutech.nl ) https://lists.berlios.de/pipermail/opensim-users/2012-September/010986.html
2012-09-30 07:22:55 -07:00
001ec0e2e6
Merge branch 'avination' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Agent/AssetTransaction/AgentAssetsTransactions.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-27 17:29:44 +01:00
ca67ee60ac
add missing transactionID in SendInventoryItemCreateUpdate. and make use
...
of it on inventoryAccessModule, etc. Most likelly it's needs where there
is a transactionID not zero
2012-09-24 21:22:08 +01:00
bbaf2c5a80
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-24 20:14:00 +01:00
b481a78234
Don't fail to create an IRC nick if nick randomization is disabled in the IRC module.
...
Patch from http://opensimulator.org/mantis/view.php?id=6293
Thanks Starflower.
2012-09-20 02:01:01 +01:00
91312daeb2
Moving ScriptModuleComms into the CoreModules tree.
2012-09-17 09:04:54 -07:00
d739246030
Merge branch 'master' into careminster
2012-09-17 14:18:03 +01:00
f9721573d9
Implementing ability to register script constants and invocations on a region module automatically
2012-09-17 14:15:47 +01:00
1dd75fcdb4
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2012-09-17 14:15:22 +01:00
5e626ce55d
script invocations cannot have void return type
2012-09-17 13:29:01 +01:00
db774d4292
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/HGEntityTransferModule.cs
OpenSim/Region/Framework/Scenes/EventManager.cs
2012-09-16 04:11:20 +01:00
ce468215d5
Support multi-region OAR files
...
Merged ArchiveWriteRequestPreparation.cs and ArchiveWriteRequestExecution.cs. This simplifies the code, and it's faster to write each scene to the archive as it's found rather than all at once at the end.
2012-09-14 20:25:03 +01:00
f06394f195
Allow an incoming identifier to be specified for a JsonStore.
2012-09-11 16:42:07 -07:00
0d97beefce
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-09-09 13:30:24 +01:00
e041f09750
refactoring to allow Scene.GetLandData to accept Vector3 as an argument. Note that the prior work on LSL_Vector implicit operators means one does not need to explicitly cast a LSL_Vector to Vector3
2012-09-08 00:44:27 +01:00
cbdfca1460
Merge branch 'master' into careminster
2012-08-31 15:33:42 +01:00
dac31303b7
Type.Type is RuntimeType
2012-08-31 15:33:15 +01:00
c0feaf54de
Merge branch 'master' into careminster
2012-08-31 14:40:30 +01:00
054db94d5d
formatting
2012-08-31 14:32:33 +01:00
794c5f5a6d
adding support for static method script invocations
2012-08-31 14:32:33 +01:00
b625579780
moving assignment to new line to make next commit easier to read in diffs
2012-08-31 14:32:33 +01:00
7e41559917
using specific type instead of var
2012-08-31 14:32:33 +01:00
8cd415c2b0
formatting
2012-08-31 14:32:32 +01:00
4c58c1b116
formatting
2012-08-31 14:32:32 +01:00
e6f43023b6
adding support for finding static methods
2012-08-31 14:32:32 +01:00
bcf944db48
assign binding flags to variable
2012-08-31 14:32:32 +01:00
7a9eee8538
no need to assign result to GetMethodInfoFromType
2012-08-31 14:32:32 +01:00
05648c2c4a
changing to use Type argument instead of object
2012-08-31 14:32:31 +01:00
dff746df7b
moving code that will be common into private static method
2012-08-31 14:32:31 +01:00
f8603a215d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/IClientAPI.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/OptionalModules/Agent/InternetRelayClientView/Server/IRCClientView.cs
OpenSim/Region/OptionalModules/World/NPC/NPCAvatar.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-23 01:41:47 +01:00
bcbd450fe4
Add --force flag to "kick user" console command to allow bypassing of recent race condition checks.
...
This is to allow a second attempt to remove an avatar even if "show connections" shows them as already inactive (i.e. close has already been attempted once).
You should only attempt --force if a normal kick fails.
This is partly for diagnostics as we have seen some connections occasionally remain on lbsa plaza even if they are registered as inactive.
This is not a permanent solution and may not work anyway - the ultimate solution is to stop this problem from happening in the first place.
2012-08-20 20:24:54 +01:00
2efd13ae18
Fix a typo
2012-08-18 22:36:42 +02:00
5ac77316e0
Remove XML debug spam from vivox voice
2012-08-16 00:59:58 +02:00
ebbf349c6a
Let the temp attachment module add a command to allow attaching without permissions and add support for this (incomplete!) to LSL
2012-08-15 19:37:16 +01:00
44dc138d8b
Let the temp attachment module add a command to allow attaching without permissions and add support for this (incomplete!) to LSL
2012-08-15 18:22:52 +02:00
c42fe6c159
Prevent race conditions when one thread removes an NPC SP before another thread has retreived it after checking whether the NPC exists.
2012-08-14 21:44:06 +01:00
4a969b45bd
Remove NPC debug spam
2012-08-14 22:02:40 +02:00
5546757931
Merge branch 'avination' of ssh://3dhosting.de/var/git/careminster into avination
2012-08-14 21:37:30 +02:00
9ec35d09f8
Merge branch 'master' into careminster
2012-08-14 21:43:23 +01:00
e81e26498b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Avatar/Attachments/TempAttachmentsModule.cs
2012-08-14 16:51:47 +01:00
a5b6492223
Perform ownership transfer and permission propagation as well as needed
...
updates on the new temp attachment.
2012-08-14 13:40:13 +01:00
1be072f19e
Move inititalization to RegionLoaded to avoid a module loading order issue
2012-08-14 09:55:44 +01:00
053e7279ca
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-08-14 02:11:13 +01:00
20b66cf654
Removed more spammy NPC crap
2012-08-14 03:02:43 +02:00
4bbdcfb5ee
Implement the temp attachments. UNTESTED
2012-08-14 01:45:02 +01:00
12a329eb85
Comment spammy debug
2012-08-14 02:28:23 +02:00
62acfabec4
Add the skeleton for the temp attachments module
2012-08-14 00:54:12 +01:00
0c00abcce1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
2012-08-03 16:46:11 +01:00
72075e68c7
Save membership fee to the database when a group is created.
2012-08-03 00:44:03 +01:00
8114260946
Merge branch 'master' into careminster
2012-08-01 00:08:02 +01:00
a76a289d11
Adds support to ScriptModuleComms for region modules to export
...
constants to the script engine.
2012-07-31 10:45:37 -07:00
771d79e83e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Monitoring/BaseStatsCollector.cs
OpenSim/Region/Application/OpenSim.cs
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/SceneManager.cs
bin/OpenMetaverse.Rendering.Meshmerizer.dll
bin/OpenMetaverse.StructuredData.dll
bin/OpenMetaverse.dll
bin/OpenMetaverseTypes.dll
prebuild.xml
2012-07-28 00:39:36 +01:00
5aec0ff207
Move Watchdog and MemoryWatchdog classes into OpenSim.Framework.Monitoring with other monitoring code from OpenSim.Framework
2012-07-25 23:27:00 +01:00
35efa88c26
Rename OpenSim.Framework.Statistics to OpenSim.Framework.Monitoring.
...
This better reflects the long-term purpose of that project and matches Monitoring modules.
2012-07-25 23:11:50 +01:00
31304c222d
Make SceneManager.OnRegionsReadyStatusChange event available.
...
This is fired when all regions are ready or when at least one region becomes not ready.
Recently added EventManager.OnRegionReady becomes OnRegionReadyStatusChange to match OnLoginsEnabledStatusChange
2012-07-25 21:00:59 +01:00
6930d696e9
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/Tests/AttachmentsModuleTests.cs
2012-07-25 18:19:12 +01:00
3cf8edfd68
Rename "image queues clear" console command to "clear image queues"
...
There is less justification for this word arrangement (verb after noun) now that command help is categorized.
Also removes "image queues show" in favour of existing alias "show image queues".
2012-07-24 23:51:04 +01:00
1427430b7b
Add information about each column to "show queues" region console command help.
2012-07-24 23:48:53 +01:00
ef8570f789
Extend region console "show queues" command to show already collected time since last packeted received by the simulator from a viewer.
2012-07-24 23:39:31 +01:00
df866fd300
Merge branch 'avination' into careminster
2012-07-20 09:35:22 +01:00
7da744566d
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ClientStack/Linden/UDP/LLUDPServer.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-07-20 09:31:06 +01:00
ccc7e75ce4
minor: remove some mono compiler warnings
2012-07-19 22:37:48 +01:00
ce8b9e6c57
Fix slow loading of task inventory
2012-07-19 12:27:36 +02:00
36d744e2a5
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Inventory/Transfer/InventoryTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
2012-07-19 09:47:51 +01:00
6dda7c65ae
Add EventManager.OnRegionLoginsStatusChange fired whenever logins are enabled or disabled at any point, not just during initial startup.
...
This replaces EventManager.OnLoginsEnabled which only fired when logins were first enabled
and was affected by a bug where it would never fire if the region started with logins disabled.
2012-07-19 00:09:22 +01:00
528004d349
Perform other region ready actions even if simulator is configured to leave logins disabled on startup.
2012-07-18 23:35:05 +01:00
d97e27434c
Fix bug where region ready would be triggered a second time if a script was rezzed on a previously script-free region.
...
There is no need to listen for OnRezScript in RegionReadyModule since OnEmptyScriptCompileQueue will only fire if scripts were compiled.
2012-07-18 22:17:39 +01:00
4973fddc51
Establish EventManager.OnRegionReady event. This will only be triggerred once when the region is ready.
...
Switch MapImageServiceModule to use this.
2012-07-18 21:52:07 +01:00
6460e587c4
Pass entire scene object in OnLoginsEnabled event rather than just the region name.
...
This saves listeners from having to re-retrieve the scene from their own lists, which won't work anyway if multiple regions with the same name have been allowed
2012-07-18 21:29:12 +01:00
cd6d7429f8
Only listen to LoginsEnabled event in RegionReadyModule if it has been asked to disable logins until all scripts have been compiled
2012-07-18 21:03:35 +01:00
64393a7ca8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-07-13 02:27:16 +01:00
dda999a22c
Remove IClientIPEndpoint client interface for now.
...
This may well come back in the future when this subinterface is actually used but it currently isn't and I feel the name was poor.
Everything uses IClientAPI.RemoveEndPoint which also returned the full endpoint rather than just the ip address.
2012-07-12 23:43:02 +01:00
3b3d9967b1
Remove IClientAPI.GetClientEP() in favour of existing identical IClientAPI.RemoteEndpoint.
2012-07-12 23:29:57 +01:00
d632fd7124
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Instance/ScriptInstance.cs
2012-07-12 08:55:16 +01:00
916e3bf886
Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than constructing fresh copies.
...
The encodings are thread-safe and already used in such a manner in other places.
This isn't done where Byte Order Mark output is suppressed, since Encoding.UTF8 is constructed to output the BOM.
2012-07-11 22:54:22 +01:00
0bc8238a6c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Watchdog.cs
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-07-11 03:56:50 +01:00
112cddc9ca
minor: rearrange INITIALIZATION COMPLETE log message so that it's clear init is only complete for a particular region at a time
2012-07-07 00:53:17 +01:00
3bd134474b
minor: Get RegionReady module to shout initialization complete status to draw the eye
2012-07-07 00:09:33 +01:00
ae1f2114f5
Mantis 6077 trim NPC chat on channel zero.
...
This patch trims leading and trailing spaces from NPC chat and
suppresses the sending of empty chat strings on open chat channel 0.
2012-07-06 22:49:18 +01:00
1b1f841c6a
Mantis 6063 osNpcTouch.
...
Allow NPCS to touch obects.
2012-07-06 22:37:19 +01:00
5776351f6a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-07-05 22:17:39 +01:00
951b45b80f
Add OSSL function osForceAttachToAvatarFromInventory()
...
This works like osForceAttachToAvatar() but allows an object to be directly specified from the script object's inventory rather than forcing it to be rezzed in the scene first.
Still only attaches objects to the owner of the script.
This allows one to bypass the complicated co-ordination of first rezzing objects in the scene before attaching them.
Threat level high.
2012-07-05 00:05:06 +01:00
d893e54f4b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-06-14 00:10:52 +01:00
cf080a68d6
Remove long obsolete and unused IClientAPI.KillEndDone()
2012-06-13 23:42:22 +01:00
e733fb32cf
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Warp3DMap/Warp3DImageModule.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SimStatsReporter.cs
2012-06-06 13:07:05 +01:00
abf94627f6
Ensure closure of bitmap and memory stream with using() statements in WorldViewModule.
...
If this has any effect then it will only be to the map images returned via requests to the /worldview simulator HTTP path (not enabled by default)
2012-06-06 02:45:36 +01:00
884c0e7bb1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/ServiceConnectorsOut/Simulation/LocalSimulationConnector.cs
OpenSim/Region/Framework/Scenes/Scene.cs
OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-05-27 19:24:30 +01:00
8f88c17df9
refactor: Rename ConsoleTableRow and ConsoleTableColumn to ConsoleDisplayTableRow and ConsoleDisplayTableColumn
2012-05-23 03:23:37 +01:00
2222d979cc
refactor: rename ConsoleTable -> ConsoleDisplayTable for clarity
2012-05-23 02:37:38 +01:00
fe029cf4e8
Merge branch 'avination' into careminster
2012-05-13 01:25:03 +01:00
e2dc04586a
Merge branch 'master' into careminster
2012-05-13 01:24:01 +01:00
7461fe4554
TEST MESS* reduce animation packets send. Added onchangeanim event with parameters to define if to add or remove, and if to send anims pack on that evocation, etc
2012-05-12 15:27:37 +01:00
903cff9264
Add ConsoleTable framework class for future uniform formatting of console output tables.
...
Still subject to change - if you use this be prepared to change your output code if/when the methods change.
Make new "attachments show" command use this.
2012-05-10 23:47:39 +01:00
bce3e7cb06
Add "attachments" show console command that will show the server's record of which attachments an in-scene avatar has.
...
For debugging purposes.
2012-05-10 22:48:03 +01:00
df7abbb367
Merge branch 'master' into careminster
2012-05-07 12:07:47 +01:00
4186fa10f0
remove default values from prior commit since mono cant deal with them
2012-05-07 00:08:56 -07:00
b697d0e895
add OS_NPC_RUNNING option to osNpcMoveToTarget() to allow running speed for moving NPCs
2012-05-06 23:54:50 -07:00
31ab8b2fe0
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/WebUtil.cs
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-05-05 10:32:04 +01:00
231a3bf147
Implement optional name and description on http stream handlers so that we can relate a slow request to what the handler actually does and the agent it serves, if applicable.
...
This is most useful for capabilities where the url is not self-describing.
2012-05-03 01:45:49 +01:00
ad12b5df49
Merge branch 'master' into careminster
2012-04-29 02:23:54 +01:00
cd755fe598
Remove mono compiler warning. Adjust message log to error from info
2012-04-28 00:31:11 +01:00
90305001de
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-04-27 17:09:49 +01:00
07e62df558
Add regression test for teleporting an agent between separated regions on the same simulator.
...
This involves a large amount of change in test scene setup code to allow test scenes to share shared modules
SetupScene is now an instance method that requires an instantiation of SceneHelpers, though other SceneHelpers methods are still static
May split these out into separate classes in the future.
2012-04-27 00:58:54 +01:00
fba802bb03
Merge branch 'master' of /home/opensim/var/repo/opensim
2012-04-26 16:13:47 -04:00
b8114d2b67
Add a version of osNpcSay that takes a channel number Mantis 5747
...
osNpcSay(UUID npc, string message) left untouched
New functions:-
osNpcSay(UUID npc, int channel, string message)
osNpcShout(UUID npc, int channel, string message)
osNpcWhisper(UUID npc, int channel, string message)
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-04-26 16:13:29 -04:00
b62eee2f0b
Merge branch 'master' into careminster
2012-04-25 18:55:51 +01:00
1afae01311
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2012-04-25 09:52:44 -07:00
bec100a662
Add try/catch around Json script method registration to avoild some issues
...
with .NET 3.5 vs 4.0 differences.
See http://opensimulator.org/mantis/view.php?id=5971
2012-04-25 09:51:30 -07:00
9a23501824
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-04-25 02:33:39 +01:00
683cfc6f82
refactor: Combine ScenePresence.Teleport() and TeleportWithMomentum()
...
These are identical apart from setting Velocity = zero, which has no practical effect anyway since this is zeroed when the avatar is added back to the physics scene.
2012-04-25 02:07:55 +01:00
def65cd94a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-04-25 01:22:09 +01:00
2f398231ac
Minor improvements to logging
...
Eliminated an extra newline in the console if the log line doesn't contain a category (example of a category: "[ASSETS]").
2012-04-24 21:38:09 +01:00
c5520dc83f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Warp3DMap/MapImageModule.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-24 21:30:12 +01:00
6c21e15cb9
Add online/offline indicator to "friends show" region console command.
...
Improve output table formatting.
2012-04-24 00:32:01 +01:00
65b3e13010
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-04-20 00:17:14 +01:00
5936e0c376
Allow scripts in attachments owned by the NPC to control the NPC
2012-04-18 19:51:27 +02:00
fc9f244a7d
Merge branch 'master' into careminster
2012-04-18 00:28:33 +01:00
84891930aa
clean up some more logging spam in the jsonstore modules
2012-04-17 14:23:43 -07:00
4db518b9a3
Fix the Csharp 3.0 vs 4.0 problem in JsonStore initialization.
...
Cut down on the logging spam.
2012-04-17 14:15:17 -07:00
5ff2bda587
This commit adds a new optional region module, JsonStore, that provides structured
...
storage (dictionaries and arrays of string values) for scripts and region modules.
In addition, there are operations on the storage that enable "real" distributed
computation between scripts through operations similar to those of a tuple space.
Scripts can share task queues, implement shared locks or semaphores, etc.
The structured store is limited to the current region and is not currently
persisted. However, script operations are defined to initialize a store from a notecard
and to serialize the store to a notecard.
Documentation will be posted to the opensim wiki soon.
2012-04-17 13:45:27 -07:00
4bb72c9ffe
make the namespace for the ScriptModuleComms consistent with its file system location
2012-04-17 13:45:03 -07:00
b39de2425c
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-04-07 04:52:14 +01:00
67537f3596
Added missing refresh of group membership client side cache to the groups module. Before memberships of non active groups often were not stored in the cache (n_groupPowers).
2012-04-05 13:03:57 +02:00
f3132c45d9
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
OpenSim/Tests/Common/Mock/TestClient.cs
2012-03-31 02:18:02 +01:00
32a953fed7
refactor: Rename SOG.GetChildPart() to GetPart() since it can also return the 'root' part.
2012-03-31 01:52:06 +01:00
269e479cdc
minor: remove some now unneeded code from FriendsCommandsModule
2012-03-30 02:00:01 +01:00
3525c876c8
Make default "show friends" console command show friends fetched from the friends service.
...
There is no a --cache option which will show friends from the local cache if available.
2012-03-30 01:57:38 +01:00
bce7964ac2
refactor: Move "friends show cache" console command out into separate FriendsCommandsModule.
...
Expose required methods on IFriendsModule. Rename GetFriends() -> GetFriendsFromCache() for self-documentation
2012-03-30 01:05:29 +01:00
22a85b947a
Add back parts of reverted changes that were not concerned with child agent caching.
...
This adds ScenePresence to IClientAPI.SceneAgent earlier on in the add client process so that its information is available to EventManager.OnNewClient() and OnClientLogin()
Also add a code comment as to why we're caching friend information for child agents.
2012-03-29 01:26:30 +01:00
93ac47f0d3
Revert "Simplify friends caching by only doing this for root agents - no functions require caching for child agents."
...
We need to cache child agents so that friends object edit/delete permissions will work across boarders on regions hosted by different simulators.
This reverts commit d9f7b8549b
2012-03-29 01:08:47 +01:00
d9f7b8549b
Simplify friends caching by only doing this for root agents - no functions require caching for child agents.
...
This allows us to avoid unnecessary multiple calls to the friends service.
All friends functions originate from the root agent and only go to other root agents in existing code.
This also allows us to eliminate complex ref counting.
2012-03-28 23:40:25 +01:00
7dad1ded2e
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/Friends/FriendsModule.cs
2012-03-29 00:27:35 +01:00
b519cf6383
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/Client/IClientInventory.cs
OpenSim/Region/ClientStack/Linden/UDP/LLClientView.cs
OpenSim/Region/OptionalModules/Avatar/Voice/VivoxVoice/VivoxVoiceModule.cs
2012-03-28 02:20:40 +01:00
b18b1b1d70
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-27 23:14:43 +01:00
b74a89bc12
minor: clean up some code formatting in VivoxVoiceModule.cs
2012-03-27 22:33:42 +01:00
19837ff4dd
Two new scripting functions osInviteToGroup(userID) and osEjectFromGroup(userID) that invite/eject users to/from groups the object containing the script is set to. These functions also work for closed groups.
2012-03-27 22:30:02 +02:00
7223b63563
User level based restrictions for HyperGrid teleports, asset uploads, group creations and getting contacted from other grids. Incoming HyperGrid teleports can also be restricted to local users.
2012-03-27 22:09:58 +02:00
0bd0514e81
Merge branch 'master' into careminster
2012-03-26 16:47:02 +01:00
ad865ab4fc
Add some more overloads to allow registering overloaded methods and lists
...
of methods.
2012-03-26 16:46:07 +01:00
da9743d1d7
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 14:22:49 +01:00
3810e98474
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 14:21:15 +01:00
7e0936e4b6
Add a hust UUID to the script invocations
2012-03-26 14:19:55 +01:00
055269805d
Fix compile error in ScriptModuelComms and add some debugging into the modInvoke
...
routines to simplify finding method registration issues.
2012-03-25 22:59:06 -07:00
2c42dafe56
Fix Typo
2012-03-26 03:26:02 +01:00
e05c72d32f
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/Scripting/ScriptModuleComms/ScriptModuleCommsModule.cs
2012-03-26 03:22:26 +01:00
c9c01d5226
Further simplify ScriptComms
2012-03-26 03:20:40 +01:00
ac0f1ff0a6
Dynamically create the delegate type to reduce complexity in the caller
2012-03-26 01:47:20 +01:00
d7cc194e83
Correct the design error I introduced into ScriptComms. Untested but about to
...
be.
2012-03-26 01:47:14 +01:00
5e8d64c943
Dynamically create the delegate type to reduce complexity in the caller
2012-03-26 01:21:44 +01:00
4b76c52c41
Correct the design error I introduced into ScriptComms. Untested but about to
...
be.
2012-03-26 00:30:52 +01:00
44f1f87656
Merge branch 'master' into careminster
2012-03-25 20:07:43 +01:00
cb44808504
Simplify the module invocation registration. The types and method name
...
can be pulled fromt he delegate so we don't need to pass them explicitly
2012-03-25 19:52:38 +01:00
a14437ad5a
Add support for key, vector, rotation and list types for both
...
arguments and return values to the modInvoke family of functions.
See http://opensimulator.org/wiki/OSSL_Script_Library/ModInvoke
2012-03-24 22:43:42 -07:00
164706043d
Have the PhysicsParameters module output console command responses
...
directly to the console rather than logging at INFO (which doesn't
output anything for WARN).
There should really be a WriteLine method on ICommandConsole so all
of the different commands don't have to figure out where the command
output should go.
2012-03-23 13:11:58 -07:00
2190a62366
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-23 02:44:22 +00:00
176bba4f67
Merge branch 'master' of /home/opensim/src/opensim
2012-03-22 21:26:30 -04:00
c903813e00
RegionReady logging
...
Some maintenance to clean up logging messages
2012-03-22 20:49:45 -04:00
3381899481
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Land/LandObject.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-03-22 20:38:49 +00:00
1a8769e6ef
Instead of loading default avatar animations in both SLUtil and AvatarAnimations, load just in AvatarAnimations instead.
...
This lets us remove the dependency of OpenSim.Framework.dll on data/avataranimations.xml, which is not necessary for ROBUST.
This commit also takes care of the odd situation where animations are stored and used internally with uppercase names (e.g. "STAND")
but scripts refer to them with lowercase names (e.g. "sit").
2012-03-21 23:57:39 +00:00
30b2a8c778
Move frame loop entirely within Scene.Update() for better future performance analysis and stat accuracy.
...
Update() now accepts a frames parameter which can control the number of frames updated.
-1 will update until shutdown.
The watchdog updating moves above the maintc recalculation for any required sleep since it should be accounted for within the frame.
2012-03-20 23:12:21 +00:00
35c3124c3b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-20 23:39:02 +00:00
c7e302864a
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/World/Estate/EstateManagementModule.cs
OpenSim/Region/Framework/Scenes/Scene.PacketHandlers.cs
OpenSim/Region/Framework/Scenes/Scene.cs
2012-03-18 20:44:56 +00:00
402ff75d78
Adds a new script command 'modInvoke' to invoke registered functions
...
from region modules. The LSL translator is extended to generate the
modInvoke format of commands for directly inlined function calls.
A region module can register a function Test() with the name "Test".
LSL code can call that function as "Test()". The compiler will translate
that invocation into modInvoke("Test", ...)
2012-03-15 13:16:02 -07:00
84ca09f7c5
added ObjectPhysicsProperties http event message to send viewer that data. For now on caps/EventQueue, and still only used on a material change...
2012-03-15 02:24:13 +00:00
4f7ec1d691
Merge branch 'master' of ssh://3dhosting.de/var/git/careminster
2012-03-11 01:55:36 +01:00
f292e19689
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Application/OpenSimBase.cs
2012-03-11 02:29:43 +00:00
0a4056ad22
Merge branch 'ubitwork'
2012-03-11 01:47:36 +01:00
908abb1c3d
BIG MESS. changed Iclient interface so only one event is used to inform scene about position scale or rotation change by client (others can be added). Its served at SceneGraph that does permition checks, undostore and sends down to SOG. changed values are stored in a class (ObjectChangeData) and what is changed as a enum (ObjectChangeWhat) with bit fields and 'macros' of this for better readability (at top of scenegraph.cs lasy to find better place for now) this can be extended for other things clients changes and need undo/redo. SOG process acording to what is changed. Changed UNDO/redo to use this also (warning is only storing what is changed, previus stored all, this must be checked for side efects. to save all PRS change commented line in scenegraph). Still have excessive calls to ScheduleGroupForTerseUpdate. **** UNTESTED ****
2012-03-10 20:32:19 +00:00
bdc968f1fc
Factor out common default animations code into SLUtil. LLClientView now makes use of the SLUtil copy via a method rather than each LLClientView loading a separate copy.
...
As per opensim-users mailing list discussion.
2012-03-09 23:57:24 +00:00
3dbf754651
Merge branch 'master' into careminster
2012-03-09 23:00:24 +00:00
35f2479858
fix for NPC not playing internal animations
2012-03-09 22:58:59 +00:00
b0fc96c17d
Merge branch 'master' into careminster
2012-03-08 19:10:22 +00:00
749c3fef8a
Change "help" to display categories/module list then "help <category/module>" to display commands in a category.
...
This is to deal with the hundred lines of command splurge when one previously typed "help"
Modelled somewhat on the mysql console
One can still type help <command> to get per command help at any point.
Categories capitalized to avoid conflict with the all-lowercase commands (except for commander system, as of yet).
Does not affect command parsing or any other aspects of the console apart from the help system.
Backwards compatible with existing modules.
2012-03-08 01:51:37 +00:00
f3e04beb2e
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-07 00:51:24 +00:00
0be4ed3df4
Prevent scripted region crossings from crashing with prim limits enabled
2012-03-06 22:27:01 +01:00
1dc03e5c4f
Simplify NPCModuleTests code by putting the NPCModule in an instance variable rather than making each test fetch it seperately.
...
Also rename instance variables in the test to conform to naming standards and for understandability
2012-03-06 01:47:43 +00:00
5004d0ad09
Merge branch 'master' into careminster
2012-03-06 01:45:20 +00:00
d44b7c486a
Go back to setting appearance directly in NPCModule.SetAppearance() to fix mantis 5914
...
The part reverted is from commit 2ebb421http://opensimulator.org/mantis/view.php?id=5914
2012-03-06 01:27:30 +00:00
af46650bae
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-03-06 01:18:37 +00:00
182f5efbe9
Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into careminster
2012-03-04 16:23:46 +00:00
d342008e5b
Fix NPC appearance setting to include attachments again
2012-02-27 08:49:19 +01:00
37068d17c5
Merge branch 'master' into careminster
2012-02-24 09:56:06 +00:00
f67f37074f
Stop spurious scene loop startup timeout alarms for scenes with many prims.
...
On the first frame, all startup scene objects are added to the physics scene.
This can cause a considerable delay, so we don't start raising the alarm on scene loop timeouts until the second frame.
This commit also slightly changes the behaviour of timeout reporting.
Previously, a report was made for the very first timed out thread, ignoring all others until the next watchdog check.
Instead, we now report every timed out thread, though we still only do this once no matter how long the timeout.
2012-02-24 05:02:33 +00:00
985526b662
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
OpenSim/Region/Framework/Scenes/Serialization/SceneObjectSerializer.cs
2012-02-18 22:21:10 +00:00
6b867773a8
Remove some debugging output form the logger
2012-02-16 08:59:34 -05:00
0c1074537b
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/OSSL_Api.cs
2012-02-16 00:38:04 +00:00
c906128191
Fix some logic mistakes where firstly osNpcCreate() without options was creating npcs sensed as agents and secondly the OS_NPC_SENSE_AS_AGENT option was having the opposite effect.
...
Hopefully makes progress on addressing http://opensimulator.org/mantis/view.php?id=5872
2012-02-16 00:22:39 +00:00
2ebb421331
Refactor appearance saving for NPC to use AvatarFactoryModule interface.
2012-02-14 17:20:34 -08:00
272ba5a741
Merge branch 'master' into careminster
2012-02-15 01:11:17 +00:00
a9e8bd59a3
Fix a race condition in the simian groups connector. When requests were
...
too slow they would circumvent the cache (piling up on the network service
and making the problem even worse). This condition happens frequently
during permission checks.
2012-02-13 19:38:22 -08:00
4589ce61bc
Fix: get embedded objects from Notecard fails with activated FreeSwitchVoiceModul
...
http://opensimulator.org/mantis/view.php?id=2607
2012-02-14 02:12:12 +00:00
215acbcc96
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Framework/InventoryAccess/InventoryAccessModule.cs
OpenSim/Region/OptionalModules/World/NPC/NPCModule.cs
2012-02-10 10:20:51 +00:00
9c84a8162f
If NPCModule.CreateNPC() fails to create the required ScenePresence (which should in theory never happen), don't add the NPC to the npc list but return UUID.Zero instead.
2012-02-09 01:17:59 +00:00
7c888f6af1
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2012-02-09 00:19:37 +00:00
dbe32a1f6d
minor: put in commented out logging statements for future reuse
2012-02-09 00:10:45 +00:00
9c6ba8d18f
Push more NPC stuff into threads
2012-02-08 13:04:23 +01:00
ce5e900721
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Data/MySQL/Resources/RegionStore.migrations
OpenSim/Region/Framework/Scenes/Scene.Inventory.cs
2012-02-04 11:48:20 +00:00
0742630d81
Merge branch 'master' of /home/opensim/src/opensim
2012-02-03 18:20:26 -05:00
ce34b359ad
Extend m_avatars lock in NpcModule.CreateNPC over both creation of NPC scene presence and population of m_avatars.
...
This is required to stop a race where the SensorRepeat module can detect an NPC avatar before m_avatars is populated.
Extending the lock is the easiest to understand solution rather than getting complicated with null checks.
Hopefully resolves http://opensimulator.org/mantis/view.php?id=5872
2012-02-03 23:04:26 +00:00
5c545d1d2e
Fix: Covenant changed time not set http://opensimulator.org/mantis/view.php?id=5869
...
Signed-off-by: BlueWall <jamesh@bluewallgroup.com>
2012-02-03 18:02:51 -05:00
447a66d660
Replace ParcelAccessEntry with a new struct, LandAccessEntry, which more
...
accurately reflects the data sent by the viewer. Add times bans and the
expiration of timed bans.
Warning: Contains a Migration (and nuts)
2012-02-02 23:40:56 +00:00
07c487a28f
Make ban, eject, freeze and the scripted versions of those work.
2012-02-02 21:36:45 +01:00
428407c5e4
Merge branch 'master' into careminster
2012-01-28 01:01:23 +00:00
7352aea9ac
Remove IClientAPI from the money module. It was only used to pass in the
...
agent id anyway
2012-01-28 00:18:12 +00:00
7837c611fb
Add OS_NPC_SENSE_AS_AGENT option to osNpcCreate().
...
This allows NPCs to be sensed as agents by LSL sensors rather than as a specific NPC type (which is currently an OpenSimulator-only extension).
Wiki doc on this and other recent NPC functions will follow soon
2012-01-28 00:00:12 +00:00
427ab55058
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/SceneGraph.cs
2012-01-25 00:45:57 +00:00
7e76397a26
minor: correct text and usage for "image queues show" reigon console command.
2012-01-24 20:54:35 +00:00
ba3b0c69f1
Merge branch 'master' into careminster
2012-01-21 19:52:33 +00:00
b6f3de5028
Telehub Support:
...
Support for viewer side of telehub management. Can manupulate Telehubs and SpawnPoints from the viewer estate managemnt tools. This is a work in progress and does not yet persist or affect teleport routing.
2012-01-20 23:50:37 -05:00
c92a9a6640
Add "image queues clear <first-name> <last-name>" console command
...
This allows a way to manually clear pending image queue requests for debug purposes
2012-01-19 19:49:06 +00:00
eea726d74e
RegionReady:
...
Back out some of the oar monitoring for the time being. Need to find a better way to get feedback. Will re-visit this soon.
2012-01-18 20:30:57 -05:00
b14a6acd2f
Merge branch 'master' into careminster
2012-01-16 23:08:47 +00:00
2e4fbe6b17
protect the region ready alerts for loading oarfiles if no post URI is set
2012-01-14 23:43:21 -08:00
43128c9016
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectGroup.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
2012-01-14 06:09:19 +00:00
57ba9ef5ad
Update RegionReadyModule
...
Fix triggering of alerts when rezzing first script to an empty region, add login disable when loading oars.
2012-01-13 11:35:44 -05:00
cf166d3f1e
Merge branch 'master' into careminster
2012-01-12 23:22:55 +00:00
1ac5aa6808
Add remove test for unowned avatars
2012-01-12 20:47:19 +00:00
ba3491c76e
Add permissions checks for owned avatars to all other osNpc* functions.
...
This is being done outside the npc module since the check is meaningless for region module callers, who can fake any id that they like.
2012-01-12 19:06:46 +00:00
b47c0d7e51
refactor: Move existing npc owner checks to NPCModule.CheckPermissions() methods and expose on interface for external calls.
2012-01-12 18:14:19 +00:00
4492bc1bcd
Merge branch 'master' into careminster
2012-01-12 17:52:29 +00:00
53fb20880c
minor: Fix wrong column length in image queues report
2012-01-10 22:02:35 +00:00
5002f06d24
rename "show image queue" to "show image queues" in line with other udp info commands.
...
Eliminate redundant one line methods
2012-01-10 21:36:35 +00:00
ef074deb52
Add "show image queue <first-name> <last-name>" region console command
...
This is so that we can inspect the image download queue (texture download via udp) for debugging purposes.
2012-01-10 21:30:12 +00:00
8fa1108b72
Merge branch 'master' into careminster
2012-01-10 21:28:59 +00:00
d67e8291c8
Add "app find <uuid-or-start-of-uuid>" command to find the appearance using a particular baked texture, if any.
...
This is for debugging to relate texture console entries back to particular users on the simulator end.
2012-01-10 18:41:07 +00:00
1cc685e820
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2012-01-10 18:33:32 +00:00
7518b075b7
Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results.
2012-01-06 22:35:06 +00:00
f1846045a6
Add osNpcCreateOwned to create an owned NPC. Those can be sensed only by the owner, can be destroyed only by the owner and only the owner can save their appearance. Added "NPC" as a flag to llSensor to sense NPCs and exclude them from "AGENT" results.
2012-01-06 21:34:43 +01:00
fdfc4ab2a8
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Services/Connectors/Asset/AssetServiceConnector.cs
2012-01-06 00:08:18 +00:00
b86e7715a8
Improve "j2k decode" command to tell us how many layers and components were decoded, instead of just success/failure
2012-01-05 22:54:33 +00:00
5ea9740f1b
Add a "j2k decode" region console command that allows a manual request for a JPEG2000 decode of an asset
...
For debugging purposes.
2012-01-05 22:40:49 +00:00
da0fc3c8f5
Make "show asset" command available simulator side. Actually make the service command be "show asset" instead of "show digest" this time.
...
Last time I accidnetally just changed the usage message.
2012-01-05 21:11:32 +00:00
7319ba62dd
Move simulator asset info commands to an optional module from the connector. Make them conform with service side commands.
...
This stops them appearing twice when Hypergrid is enabled.
2012-01-05 20:51:49 +00:00
c201b54b85
Improve "app rebake" command to return a better message if no uploaded texture ids were available for the rebake request
2012-01-05 19:40:54 +00:00
1ebc9d04aa
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
OpenSim/Region/Framework/Scenes/SceneObjectPart.cs
2012-01-05 08:15:33 +00:00
8fb70a2058
Add "appearance rebake" command to ask a specific viewer to rebake textures from the server end.
...
This is not as useful as it sounds, since you can only request rebakes for texture IDs already received.
In other words, if the viewer has never sent the server this information (which happens quite often) then it will have no effect.
Nonetheless, this is useful for diagnostic/debugging purposes.
2012-01-04 22:45:07 +00:00
2b4ebe657c
Merge branch 'master' into careminster
2011-12-19 23:16:20 +00:00
87a2d8d51b
Move HandleObjectGroupUpdate() from GroupsModule to Scene.PacketHandlers.cs as this is updating SOG/SOP.GroupID, which is arguably generic.
2011-12-19 23:03:45 +00:00
efa4284391
Merge branch 'master' into careminster
2011-12-19 21:30:57 +00:00
0b91ec8dd2
Migrate detailed "appearance show" report generation up to AvatarFactoryModule from AppearanceInfoModule so that it can be used in debug (inactive).
...
Further filters "debug packet <level>" to exclused [Request]ObjectPropertiesFamily if level is below 25.
Adjust some method doc
Minor changes to some logging messages.
2011-12-19 18:58:05 +00:00
759f1d2dbe
Merge branch 'master' into careminster
2011-12-18 10:49:45 +00:00
684482352c
Fix bug where objects couldn't be set back to the "none" group.
...
This is handled by treating UUID.Zero as a special case.
Currently, asking for the "none" group returns nothing because XMLRPC groups, at least, is not properly handling this case.
It may be better in the future to have GroupsModule return an appropriate GroupsData structure instead or require the underlying services to behave appropriately.
This is a further component of http://opensimulator.org/mantis/view.php?id=5588
2011-12-17 02:35:08 +00:00
f9137c923b
Fix bug where objects could not be set to a new group if the group had been created in that client session, or if no other action has been performed on the object.
...
There were two problems here:
1) On object group update, we looked for the group is the IClientAPI group cache rather than in the groups service. This fails to groups created newly in that session
2) On object group update, we weren't setting the HasGroupChanged flag. This meant that the change was not persisted unless some other action set this flag.
This commit fixes these issues and hopefully addresses http://opensimulator.org/mantis/view.php?id=5588
This commit also moves HandleObjectGroupUpdate() to the GroupsModule from the Scene.PacketHandlers.cs file
2011-12-17 02:23:24 +00:00
a9b39d6e5d
Tunnel [GroupsModule] DebugEnabled setting down into XmlRpcGroupsServicesConnectorModule so that we can record cache misses
2011-12-16 20:53:50 +00:00
c34ab0ee66
Cleaned up ScenePresence parameters for Flying, WasFlying, FlyingOld and IsColliding
2011-12-12 02:43:38 -08:00
52a4dbccbe
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Framework/RegionInfo.cs
OpenSim/Region/Framework/Scenes/ScenePresence.cs
2011-12-12 11:42:22 +00:00
3a91085ac2
Implement handler for TeleportCancel inbound packet
2011-12-10 15:17:34 +00:00
6b080d57cb
Merge branch 'master' into careminster
2011-12-10 15:19:31 +00:00
3f42183797
Merge branch 'master' into careminster
...
Conflicts:
OpenSim/Region/CoreModules/Avatar/AvatarFactory/AvatarFactoryModule.cs
2011-12-10 00:40:41 +00:00
e88ad5aab9
minor: remove a mono compiler warning
2011-12-09 23:55:54 +00:00
af3cd00048
Get rid of IScene.PresenceChildStatus() which always had to execute a lookup in favour of IClientAPI.ISceneAgent.IsChildAgent instead.
2011-12-09 23:07:53 +00:00
f61e54892f
On a new client circuit, send the initial reply ack to let the client know it's live before sending other data.
...
This means that avatar/appearance data of other avatars and scene objects for a client will be sent after the ack rather than possibly before.
This may stop some avatars appearing grey on login.
This introduces a new OpenSim.Framework.ISceneAgent to accompany the existing OpenSim.Framework.ISceneObject and ISceneEntity
This allows IClientAPI to handle this as it can't reference OpenSim.Region.Framework.Interfaces
2011-12-08 18:34:23 +00:00
96539ffc79
Merge branch 'master' into bigmerge
...
Conflicts:
OpenSim/Region/Framework/Scenes/Scene.cs
2011-12-08 18:29:19 +00:00
28da235888
Merge branch 'master' into bigmerge
2011-12-06 19:01:05 +00:00
136a6a6e0f
Make "show appearance" a synonym for "appearance show"
2011-12-06 18:36:11 +00:00
b9a461c5ad
In "appearance show", if a particular avatar is specified, print out texture UUID for each bake type and whether the simulator can find it.
2011-12-06 18:32:27 +00:00
ec4f217af8
Actually send the avatar data if an individual avatar is specified, rather than accidentally doing nothing
2011-12-06 18:06:29 +00:00
1b9eb52850
Allow "appearance show" command to take an optional avatar name
2011-12-06 18:03:16 +00:00
4be85eeaa5
Make it possible to manually send appearance information via the "appearance send" command for a chosen avatar as well as all
2011-12-06 16:42:44 +00:00
d33d12ba83
Provide feedback as to which avatars are resending appearance informion on "appearance send" console command
2011-12-06 16:07:24 +00:00
af9ccfa15c
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2011-12-05 20:50:44 +00:00
4567555c49
Implement IOSHttpRequest and IOSHttpResponse http interfaces and use instead of OSHttpRequest/OSHttpResponse.
...
This is required for the substitution of different HTTP servers or the newer HttpServer.dll without having to commit to a particular implementation.
This is also required to write regression tests that involve the HTTP layer.
If you need to recompile, all you need to do is replace OSHttpRequest/OSHttpResponse references with IOSHttpRequest/IOSHttpResponse.
2011-12-05 20:44:20 +00:00
bc17e2e9cf
Merge branch 'master' into bigmerge
2011-12-05 20:32:35 +00:00
66f4ce354f
Fix CHANGED_TEXTURE and CHANGED_COLOR.
2011-12-05 19:01:14 +00:00
2a8a46a32d
Fix CHANGED_TEXTURE and CHANGED_COLOR.
2011-12-05 18:32:40 +01:00
ec8c93aa5e
Implement ChangeInventoryItemFlagsPacket handling
2011-12-04 12:35:01 +01:00
0cb33a5398
Line endings
2011-11-23 16:09:11 -08:00
a8270cb48c
Merge branch 'master' into bigmerge
2011-11-24 01:16:37 +00:00
d639f7fdf3
minor: remove mono compiler warning
2011-11-22 22:16:09 +00:00
a1426739a2
Merge branch 'master' into bigmerge
2011-11-10 17:35:35 +00:00
39b967e214
Correct test failure in sit position check of TestSitAndStandWithNoTarget()
...
Curiously, a Vector3.ToString() will not display the last two places of the float. In this case, the failure of
the assertion would confusingly report Expected: <0, 0, 0.8454993> But was: <0, 0, 0.8454993> when actual Z figure is 0.845499337
Should fully address http://opensimulator.org/mantis/view.php?id=5779
2011-11-07 22:53:52 +00:00
Diva Canto