aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-09-2523-157/+231
|\
| * Fix a minor economy issueMelanie2010-09-251-1/+4
| |
| * Add prim name to OdePrim Error and Warning messages.Justin Clark-Casey (justincc)2010-09-251-42/+45
| | | | | | | | This aims to make it easier to identify and remove rogue prims that are causing ODE to fall over.
| * Add UUID to physics prim name parameter so that diagnostic messages can be ↵Justin Clark-Casey (justincc)2010-09-252-3/+3
| | | | | | | | | | | | made more useful. If a separate UUID parameter is better for the future then this can be added later on.
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-2520-131/+202
| |\
| | * Added delay for llSetPrimitiveParams() and llSetLinkPrimitiveParams() ↵Kevin Cozens2010-09-241-100/+104
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * * One more item for CSharpSqliteTeravus Ovares (Dan Olivares)2010-09-231-3/+10
| | | | | | | | | | | | | | | | | | | | | * 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.
| | * * Add CSharpSqlite to prebuildTeravus Ovares (Dan Olivares)2010-09-2313-12/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| | * * Pushing the Community.CSharpSqlite.Sqlite dll's I built. This is a ↵Teravus Ovares (Dan Olivares)2010-09-234-0/+0
| | | | | | | | | | | | 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.
| * | If the uuid gatherer fails to find the asset containing gesture metadata, ↵Justin Clark-Casey (justincc)2010-09-241-0/+7
| | | | | | | | | | | | | | | | | | | | | 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
* | | Experimental locking of taint processingMelanie2010-09-251-76/+80
| | |
* | | if you can't edit a prim's inventory, you don't need to see the asset ids.Melanie2010-09-241-1/+8
| | | | | | | | | | | | | | | | | | Prevents stealing IDs of animations, sounds and textures from prim inventories. Prevents copybot from gathering the wearable UUIDs needed for pirating things from vendors.
* | | When clearing the addin registry, respect a custom pathMelanie2010-09-241-4/+13
| | |
* | | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-09-212-6/+4
|\ \ \ | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Fix a typoMelanie2010-09-211-3/+3
| | | |
| * | | Refactor script create permission into the perms moduleMelanie2010-09-212-15/+23
| | | |
| * | | Fix a merge artefact that broke script state persistence in XAttachmentsMelanie2010-09-192-6/+4
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-2116-53/+556
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-09-2114-37/+532
| |\ \ | | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-215-2/+354
| | |\
| | | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-09-2119-150/+867
| | | |\
| | | | * * Tweaked the LocationTests for maximum coverage.Teravus Ovares (Dan Olivares)2010-09-182-1/+60
| | | | | | | | | | | | | | | | | | | | * Added more mundane tests.
| | | | * * Covered the type converters in SLUtil with unit tests.Teravus Ovares (Dan Olivares)2010-09-181-1/+57
| | | | | | | | | | | | | | | | | | | | * Does anyone have an example raw notecard to look at and test the notecard parser?
| | | | * * More Mundane TestsTeravus Ovares (Dan Olivares)2010-09-172-0/+198
| | | | | | | | | | | | | | | | | | | | * SL Util tests of AssetType2ContentType and ContentType2AssetType
| | | * | If the uuid of a SceneObjectGroup (RootPart) is changed before adding to the ↵Justin Clark-Casey (justincc)2010-09-212-2/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * | | Improve the explanative text of migration failuresJustin Clark-Casey (justincc)2010-09-181-3/+3
| | | |/ | | |/| | | | | | | | | 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.
| | * | Clarify help text for use of file paths with console command "create region".Marck2010-09-181-1/+1
| | | |
| | * | REST Console delivers responses with content type text/xml instead of ↵Marck2010-09-181-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | text/plain. Non-error responses to requests SessionCommand and CloseSession should use the appropriate content type for their XML data payload.
| | * | Add m_syncRoot lock to MapAndArray.ContainsKey(), as discussed with jhurlimanJustin Clark-Casey (justincc)2010-09-181-2/+3
| | | | | | | | | | | | | | | | 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
| | * | Stop broadcasting non 0/DEBUG ChatTypeEnum.Region messages to all avatarsJustin Clark-Casey (justincc)2010-09-181-3/+1
| | | | | | | | | | | | | | | | This allows non public/debug region wide messages to be sent to scripts but not be broadast to avatars
| | * | Move OpenSim/Framework/tests/PrimeNumberHelperTests.cs to ↵Justin Clark-Casey (justincc)2010-09-181-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | OpenSim/Framework/Tests/PrimeNumberHelperTests.cs I'm assuming the lowercase tests was a mistake. Please revert if it actually wasn't
| | * | For all Flotasm group module XMLRPC calls, correct parameter ↵Justin Clark-Casey (justincc)2010-09-171-9/+2
| | | | | | | | | | | | | | | | | | | | | | | | requestingAgentID to RequestingAgentID This was stopping the get group member roles call from working, and may have affected other things
| | * | Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2010-09-173-81/+24
| | |\ \
| | * | | * Fixed and re-enabled CacheTestsTeravus Ovares (Dan Olivares)2010-09-173-15/+166
| | | | | | | | | | | | | | | | | | | | | | | | | * 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)
| * | | | Fix a typoMelanie2010-09-211-3/+3
| | | | |
| * | | | Refactor script create permission into the perms moduleMelanie2010-09-212-15/+23
| | |/ / | |/| |
* | | | Overwrite the core version of the string parsing method with oursMelanie2010-09-171-60/+37
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-173-37/+302
|\ \ \ \ | |/ / /
| * | | Add LandServices to make landmarks work right in gridsMelanie2010-09-172-0/+2
| | | |
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-09-177-37/+355
| |\ \ \ | | |/ /
| | * | * Add a few more tests to help our meager code coverage %.Teravus Ovares (Dan Olivares)2010-09-172-0/+242
| | | | | | | | | | | | | | | | | | | | | | | | * Tests Animation Constructors * Tests Animation OSD Packing/Unpacking * Tests the PrimeNumberHelper class which is used in the cache.
| * | | Applying the llParseString2List() patch from #5036 that Melanie claims was ↵John Hurliman2010-09-171-81/+22
| | |/ | |/| | | | | | | already applied
* | | Merge branch 'careminster-presence-refactor' of ↵Melanie2010-09-171-1/+0
|\ \ \ | | | | | | | | | | | | ssh://melanie@3dhosting.de/var/git/careminster into careminster-presence-refactor
| * | | Remove the now unused partslockroot2010-09-171-1/+0
| | | |
* | | | Add LandServices to make landmarks work right in gridsMelanie2010-09-172-0/+2
|/ / /
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-171-0/+4
|\ \ \ | | |/ | |/|
| * | Send kill packets for avatars, tooMelanie2010-09-171-0/+4
| | |
* | | Merge branch 'master' into careminster-presence-refactorMelanie2010-09-1736-1275/+1034
|\ \ \ | |/ / | | | | | | | | | | | | Integrate the next large patch. Don't use this version, it has a ghost avatar issue. Next push will fix it.
| * | Revert "* Changed 11 calls for session info to the more optimized API method"root2010-09-174-37/+109
| |/ | | | | | | | | This reverts commit 5dc9ea2f2487804d788b4b80d40d91bd792de4c2. Also makes online indicators and IM more robust
| * Fixed a regression in SOG.Copy()John Hurliman2010-09-161-1/+1
| |
generated by cgit v1.1 at 2024-11-10 04:15:53 +0000