aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-03-011-1/+1
|\
| * Fix indexing on string trimBlueWall2012-03-011-1/+1
| | | | | | | | | | | | Thanks to zadark for pointing this out, smxy for deciphering the ?: operator and Plugh for the fix \o/ yay for IRC
* | Use a fully stubbed out MockConsole for unit tests rather than inheriting ↵Justin Clark-Casey (justincc)2012-03-012-23/+38
| | | | | | | | | | | | | | | | from CommandConsole. This is so that the static MainConsole.Instance doesn't retain references to methods registered by scene and other modules to service commands. This prevents the scene from being garbage collected at the end of a test. This is not the final thing preventing GC - next up is the timer started by SimStatsReporter that holds a reference to Scene that prevents end of test gc.
* | Remove more now unused third party libraries.Justin Clark-Casey (justincc)2012-03-014-0/+0
| |
* | Flick master up to 0.7.4Justin Clark-Casey (justincc)2012-02-291-1/+1
| |
* | Extend distsrc target to cleanup the files generated by running prebuildJustin Clark-Casey (justincc)2012-02-291-0/+18
|/
* Revert "Fix authentication for OpenID provider"BlueWall2012-02-291-2/+2
| | | | This reverts commit 9f597c2d423a80279c4aed042be8a991eedefa21. Fixing OpenID causes issues with other parts of the code.
* Trigger a buildBlueWall2012-02-291-0/+1
|
* Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-02-291-2/+2
|\
| * Fix authentication for OpenID providerBlueWall2012-02-291-2/+2
| |
* | Don't start pCampbot if the user doesn't supply bot firstname, lastname stub ↵Justin Clark-Casey (justincc)2012-02-291-0/+4
| | | | | | | | and password
* | Use correct casing of RegionSettings.Sandbox in the various database modules.Justin Clark-Casey (justincc)2012-02-293-4/+4
| | | | | | | | | | | | MySQL and MSSQL have it as Sandbox, sqlite as sandbox. In various different places in every plugin the wrong casing is used... Consistency, who needs it? Or one day sqlite can change to Sandbox.
* | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-02-295-92/+32
|\ \
| * | Fixed two typos. White space cleanups.Kevin Cozens2012-02-281-16/+16
| | | | | | | | | | | | Signed-off-by: nebadon <michael@osgrid.org>
| * | Some clean up in WebUtil, remove unused ServiceRequest function.Mic Bowman2012-02-271-71/+7
| | |
| * | HG: Remove async in posting assets to foreign grid. Mono hates concurrency ↵Diva Canto2012-02-251-1/+1
| | | | | | | | | | | | there.
| * | PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implementedPixelTomsen2012-02-252-4/+8
| | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5763
* | | Call Dispose() via using() on SqliteCommands in WebStatsModule after use.Justin Clark-Casey (justincc)2012-02-281-99/+98
|/ /
* | Move libopenjpeg native libraries into lib32 and lib64 as appropriate.Justin Clark-Casey (justincc)2012-02-255-5/+5
| |
* | Remove some more unused Bullet libraries.Justin Clark-Casey (justincc)2012-02-253-0/+0
| |
* | Remove old libbulletnet native libraries. These are not used in the current ↵Justin Clark-Casey (justincc)2012-02-252-0/+0
| | | | | | | | generation bullet physics plugin.
* | Move other sqlite and ode 32-bit and 64-bit libraries into lib32 or lib64 as ↵Justin Clark-Casey (justincc)2012-02-259-9/+9
| | | | | | | | appropriate.
* | Remove xunit.dll, Fadd.Globalization.Yaml.dll and Fadd.dll. It looks like ↵Justin Clark-Casey (justincc)2012-02-253-0/+0
| | | | | | | | these were once connected with HttpServer.dll but are now unused.
* | Remove EXPERIMENTAL tags from load iar/save iar commands.Justin Clark-Casey (justincc)2012-02-251-3/+0
| |
* | Establish a distsrc nant target for producing the source distribution.Justin Clark-Casey (justincc)2012-02-251-4/+10
| | | | | | | | | | This is in addition to the distbin target. The distbin target now needs distsrc to be run first. Still needs some extra tweaking that I shall eventually put in as sed invocations or similar.
* | llGetLinkMedia, llSetLinkMedia, llClearLinkMedia implementation mantis: ↵PixelTomsen2012-02-243-27/+105
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5756 http://opensimulator.org/mantis/view.php?id=5755 http://opensimulator.org/mantis/view.php?id=5754
* | Take watchdog alarm calling back outside the m_threads lock.Justin Clark-Casey (justincc)2012-02-242-5/+18
| | | | | | | | This is how it was originally. This stops a very long running alarm callback from causing a problem.
* | Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually ↵Justin Clark-Casey (justincc)2012-02-242-2/+2
| | | | | | | | returns and for consistency.
* | Get rid of some of the identical exception catching in Scene.Update().Justin Clark-Casey (justincc)2012-02-241-17/+1
| |
* | Stop spurious scene loop startup timeout alarms for scenes with many prims.Justin Clark-Casey (justincc)2012-02-2410-26/+65
| | | | | | | | | | | | | | | | 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.
* | In osSetSpeed(), if no avatar for a uuid is found then don't attempt to set ↵Justin Clark-Casey (justincc)2012-02-241-1/+3
| | | | | | | | speed.
* | llLinkSitTarget implementation http://wiki.secondlife.com/wiki/LlLinkSitTargetPixelTomsen2012-02-243-5/+33
| |
* | Load appropriate 32-bit/64-bit Windows sqlite dll if using WebStatsModule.Justin Clark-Casey (justincc)2012-02-231-0/+3
| | | | | | | | This should resolve http://opensimulator.org/mantis/view.php?id=5901
* | Try to resolve some problems with viewers crashing after hitting parcel ↵Justin Clark-Casey (justincc)2012-02-233-16/+41
|/ | | | | | | | | | banlines or freezing on the banline. This involves 1) On forcible teleport, call m_scene.RequestTeleportLocation() rather than ScenePresence.Teleport() - only EntityTransferModule now should call SP.Teleport() 2) When avatar is being forcibly moved due to banlines, use a 'stop movement' tolerance of 0.2 to requested position rather than 1 This prevents the avatar sometimes being stuck to banlines until they teleport somewhere else. This aims to fix some problems in http://opensimulator.org/mantis/view.php?id=5822
* Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-02-231-8/+2
|\
| * Remove two spurious m_sceneGraph != null checks in Scene.cs. It's set in ↵Justin Clark-Casey (justincc)2012-02-221-8/+2
| | | | | | | | constructor and never subsequent set to null.
* | Add a position parameter to region crossing of objects. This avoids theMelanie2012-02-238-18/+25
|/ | | | | | potential bad update that places an object at the opposite side of the origin sim for a moment before actually crossing it. Especially important in grids like OSG where lag between sims is high.
* Restore the taskItem null check that I accidentally blatted in 5397a6dJustin Clark-Casey (justincc)2012-02-211-0/+9
| | | | This is a valid check because the caller could supply an invalid uuid.
* Fix:LINK_ROOT flag for llGetLinkName() by SinglePrimPixelTomsen2012-02-211-1/+1
|
* Fix problem with dragging child part inventory item to user inventory.Justin Clark-Casey (justincc)2012-02-212-30/+4
| | | | | This fixes the problem by fixing the permissions module to look at root part permissions rather than having to do this for every caller. Resolves http://opensimulator.org/mantis/view.php?id=5569
* Revert "Fix:Cannot drag inventory from child prim into inventory ↵Justin Clark-Casey (justincc)2012-02-211-8/+4
| | | | | | | | http://opensimulator.org/mantis/view.php?id=5569" This reverts commit 15ce73caca9ea6448e34b95d344cbbf5c9507f6d. As per the COMMENTS in http://opensimulator.org/mantis/view.php?id=5569, I was going to fix this in a more general way.
* Fix:Cannot drag inventory from child prim into inventory ↵PixelTomsen2012-02-211-4/+8
| | | | http://opensimulator.org/mantis/view.php?id=5569
* Both 32-bit and 64-bit BulletSim.dll must have the same name. Rename the 64 ↵Justin Clark-Casey (justincc)2012-02-211-0/+0
| | | | bit one in lib64
* Load 32-bit or 64-bit BulletSim Windows library automatically as appropriate.Justin Clark-Casey (justincc)2012-02-213-0/+3
| | | | | This uses the same approach as ODE. radams, if this doesn't work for you please feel free to revert.
* Replace previous windows 64-bit sqlite3.dll with one from ↵Justin Clark-Casey (justincc)2012-02-211-0/+0
| | | | | | | | | http://system.data.sqlite.org/downloads/1.0.79.0/sqlite-netFx35-binary-bundle-x64-2008-1.0.79.0.zip In this zip, it's called System.Data.SQLite.dll. We rename it to lib64/sqlite3.dll This is a little unexpected but it works. For some reason my hand-rolled one in Visual Studio 2008 did not. This is sqlite 3.7.10. Other libraries are still currently 3.7.6 but this should make no difference. This should make it possible to use OpenSim.exe on 64-bit Windows now, though currently the bullet physics plugin will still complain (can be ignored if you are not using bullet).
* Replace win 64-bit sqlite3.dll with another version, though I suspect this ↵Justin Clark-Casey (justincc)2012-02-211-0/+0
| | | | one won't work either.
* Add 64 bit Windows sqlite3.dll and use this if running a 64-bit windows process.Justin Clark-Casey (justincc)2012-02-2111-14/+51
|
* Fix bug where NPCs would establish child agents on other neighbour regions ↵Justin Clark-Casey (justincc)2012-02-211-15/+14
| | | | that had come up after the NPC was created.
* Remove PhysXPlugin and wrappers.Justin Clark-Casey (justincc)2012-02-218-1026/+0
| | | | | In over 4 years this never progressed beyond an unimplemented stub. This doesn't mean that it can't come back if someone is interested in implementing PhysX support.
* Amend to last commit: synchronize access to queues.Diva Canto2012-02-201-2/+5
|