9f17ae580d
Merge branch 'master' into careminster-presence-refactor
2010-09-26 23:57:06 +01:00
6f78358b09
When receiving intersim IM, don't let the spoof protection bomb
2010-09-26 23:50:55 +01:00
dc49057c8a
Consistency patch: use Path.Combine() instead of + and eliminate the need
...
for a trailing slash on exports/
2010-09-26 20:03:00 +01:00
14db53b723
Another typo fix
2010-09-26 18:35:15 +01:00
d0c271adc6
Typo fixes
2010-09-26 18:06:23 +01:00
aecac9bba9
Typo fixes
2010-09-26 18:05:55 +01:00
6f689f591a
Merge Master
2010-09-26 17:56:31 +01:00
b0b4782a2b
adding configurable j2kDecodeCache path
...
allowing the decoded sculpt map cache path to be defined in
the configuration files.
Use DecodedSculpMapPath in the [Startup] section to set
the path. The default is still ./bin/j2kDecodeCache
2010-09-26 17:04:11 +01:00
8afa21cef0
Some cleanup to OpenSimDefaults.ini
...
Fixing a couple of errors
2010-09-26 17:00:56 +01:00
51e03617e9
Changes to preceding patch to make it conform to inifile formats. BLANK LINE
...
before each comment/option group, and DOUBLE SEMICOLONS before pure text
comments in OpenSim.ini.exemaple
2010-09-26 02:31:37 +01:00
4f25b73b57
Add configurable path to script engine assemblies
...
Adding ability to place script engine assemblies outside
the codebase directories.
Uses new [XEngine] option: ScriptEnginesPath = "path_to_assemblies"
Signed-off-by: Melanie <melanie@t-data.com>
2010-09-26 02:30:46 +01:00
0080f28f1d
Merge branch 'master' into careminster-presence-refactor
2010-09-25 06:57:53 +01:00
d8ae287ebf
Prevent spoofing the agent name on text IM
2010-09-25 06:56:08 +01:00
4fbdcb95a0
Merge branch 'master' into careminster-presence-refactor
2010-09-25 06:19:26 +01:00
3b76d7bbb6
Fix a minor economy issue
2010-09-25 06:09:35 +01:00
83b16612ce
Experimental locking of taint processing
2010-09-25 05:57:08 +02:00
30d3e8a13e
Add prim name to OdePrim Error and Warning messages.
...
This aims to make it easier to identify and remove rogue prims that are causing ODE to fall over.
2010-09-25 01:07:37 +01:00
6325fa515d
Add UUID to physics prim name parameter so that diagnostic messages can be made more useful.
...
If a separate UUID parameter is better for the future then this can be added later on.
2010-09-25 00:51:40 +01:00
b366ad5012
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-25 00:00:00 +01:00
5bcf9ae2f9
If the uuid gatherer fails to find the asset containing gesture metadata, then simply return rather than generating an exception
...
This matches existing behaviour, though better diagnostics for missing assets may be good later on.
This addresses http://opensimulator.org/mantis/view.php?id=4977
2010-09-24 23:58:37 +01:00
1c1f308052
if you can't edit a prim's inventory, you don't need to see the asset ids.
...
Prevents stealing IDs of animations, sounds and textures from prim
inventories. Prevents copybot from gathering the wearable UUIDs needed for
pirating things from vendors.
2010-09-24 23:48:52 +02:00
33bd4fe789
When clearing the addin registry, respect a custom path
2010-09-24 22:00:51 +02:00
8dc59f5b59
Added delay for llSetPrimitiveParams() and llSetLinkPrimitiveParams() functions per the LSL wiki.
...
Signed-off-by: Melanie <melanie@t-data.com>
This patch also fixes a large amount of trailing whitespace. While this is
beneficial, it should really be in a separate patch that fixes whitespace only.
Just good practice.
2010-09-24 16:25:14 +01:00
acd5bbdb71
* One more item for CSharpSqlite
...
* Hopefully this will enable mac people to use SQLite again
* Someone cooler then me will need to figure out how to define CSharpSqlite with Mono so the conditional will pick up.
* There's also an error that occurs when you first load OpenSimulator under CSharpSQLite that goes away after.
* The databases are not byte for byte compatible. Mono.Data.Sqlite is able to read CSharpSqlite made databases but not the reverse way.
2010-09-23 01:45:54 -04:00
983c6a74b1
* Add CSharpSqlite to prebuild
...
* Use a conditional define to determine whether we're using CSharpSqlite or Mono.Data.Sqlite
#if CSharpSqlite
using Community.CsharpSqlite.Sqlite;
#else
using Mono.Data.Sqlite;
#endif
* Hopefully, this will restore sqlite functionality on a Mac. In visual studio, you can edit the OpenSim.Data.SQLite project, go to the Build tab and enter CSharpSqlite in the box. I'm not sure how to define CSharpSqlite in Mono, someone better at it then me will have to take the job of figuring out the best way to define it in Mono.
2010-09-23 01:21:08 -04:00
33ae5ad309
* Pushing the Community.CSharpSqlite.Sqlite dll's I built. This is a slightly modified version of CSharpSqlite built in silverlight mode so that it doesn't have the locking issues that it normally would under .NET and a custom ADO.NET wrapper based on Mono.Data.Sqlite. I'm not entirely sure if these will be kept here like this in debug mode with the pdb's Maybe to start.. but after some testing we'll put them in release mode.
2010-09-23 00:50:18 -04:00
41847e8fdf
Merge branch 'careminster-presence-refactor' of ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
2010-09-21 04:03:40 +01:00
9feef34a81
Merge branch 'master' into careminster-presence-refactor
2010-09-21 04:03:14 +01:00
2b8c99c2fb
Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim
2010-09-21 04:02:50 +01:00
14adf90805
Fix a typo
2010-09-21 04:02:34 +01:00
10a37f5be4
Refactor script create permission into the perms module
2010-09-21 04:02:28 +01:00
12f9b1df8c
Fix a typo
2010-09-21 03:57:09 +02:00
7229bc4fbd
Refactor script create permission into the perms module
2010-09-21 02:08:55 +02:00
51207c24a0
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-21 01:04:08 +01:00
192bcab987
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
2010-09-21 01:01:07 +01:00
a85779e477
If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the scene, remove the old uuid reference from m_parts as well as adding the new one.
...
The separate remove and set operations is SOG.set_UUID() are both locked under m_parts.SyncRoot since they are logically atomic (though this isn't such an issue if the SOG isn't part of a scene)
Added unit test for this behaviour.
Also changed the second m_parts.AddOrReplace() to m_parts.Add(). As the old reference is now removed we never end up replacing an identical uuid. And if we replace a uuid that's already there (from a child part) then this is an error.
2010-09-21 00:58:54 +01:00
9cf8795ecf
Fix a merge artefact that broke script state persistence in XAttachments
2010-09-19 22:53:05 +02:00
27d5976b87
* Tweaked the LocationTests for maximum coverage.
...
* Added more mundane tests.
2010-09-18 03:42:37 -04:00
c203fae26b
* Covered the type converters in SLUtil with unit tests.
...
* Does anyone have an example raw notecard to look at and test the notecard parser?
2010-09-18 02:49:42 -04:00
4d83879704
* More Mundane Tests
...
* SL Util tests of AssetType2ContentType and ContentType2AssetType
2010-09-17 23:27:41 -04:00
a22f007246
Improve the explanative text of migration failures
...
When running for the first time, people see migration failures because of sql statements that are trying to move data from old tables (e.g. users). The amended text attempts to calm their nerves.
2010-09-18 03:37:10 +01:00
7ee0a8d30e
Clarify help text for use of file paths with console command "create region".
2010-09-18 02:30:56 +01:00
cd42cdcc89
REST Console delivers responses with content type text/xml instead of text/plain.
...
Non-error responses to requests SessionCommand and CloseSession should use the appropriate content type for their XML data payload.
2010-09-18 02:24:04 +01:00
2501372d3b
Add m_syncRoot lock to MapAndArray.ContainsKey(), as discussed with jhurliman
...
Though this is actually thread-safe on .net 4.0 and mono today, the .net sdk states that Dictionary instance members are not guaranteed thread-safe
2010-09-18 01:57:13 +01:00
889923841c
Stop broadcasting non 0/DEBUG ChatTypeEnum.Region messages to all avatars
...
This allows non public/debug region wide messages to be sent to scripts but not be broadast to avatars
2010-09-18 01:43:22 +01:00
4327c795f8
Move OpenSim/Framework/tests/PrimeNumberHelperTests.cs to OpenSim/Framework/Tests/PrimeNumberHelperTests.cs
...
I'm assuming the lowercase tests was a mistake. Please revert if it actually wasn't
2010-09-18 00:25:22 +01:00
b1ab3ea5d9
For all Flotasm group module XMLRPC calls, correct parameter requestingAgentID to RequestingAgentID
...
This was stopping the get group member roles call from working, and may have affected other things
2010-09-17 23:48:44 +01:00
33fbf0e329
Merge branch 'master' of ssh://MyConnection/var/git/opensim
2010-09-17 18:41:29 -04:00
94f35890e7
* Fixed and re-enabled CacheTests
...
* Added MundaneFrameworkTests.cs for the really mundane tests like testing properties,constructors, etc in OpenSim.Framework.
* Fixed LeftAxis and UpAxis unpacking from OSD to AgentPosition (copy and paste error caught while writing mundane test) (Good thing nobody uses the camera frustum from remote regions yet)
2010-09-17 18:41:12 -04:00
3a760ad12b
Overwrite the core version of the string parsing method with ours
2010-09-17 22:20:20 +01:00
Melanie