aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | 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.
| * | | | | | | | Call Dispose() via using() on SqliteCommands in WebStatsModule after use.Justin Clark-Casey (justincc)2012-02-281-99/+98
| | | | | | | | |
* | | | | | | | | Merge branch 'master' into careminsterMelanie2012-02-2527-52/+135
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Runtime/LSL_Stub.cs
| * | | | | | | | PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implementedPixelTomsen2012-02-252-4/+8
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | http://opensimulator.org/mantis/view.php?id=5763
| * | | | | | | 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
* | | | | | | | Merge branch 'master' into careminsterMelanie2012-02-2417-53/+122
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | 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
* | | | | | | Partially apply the core banlines fixMelanie2012-02-232-6/+9
| | | | | | |
* | | | | | | Merge branch 'master' into careminsterMelanie2012-02-230-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | 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
* | | | | Fix preserving the animation state of a crossing seated avatarMelanie2012-02-231-2/+10
| | | | |
* | | | | Properly sequence updates of avatars and attachments so that we don'tMelanie2012-02-232-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | update attachments on child avatars or intermingle agent and attachment updates, which would render the root prim of huds invisible
* | | | | Merge branch 'ubitwork'Melanie2012-02-231-3/+5
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | Merge branch 'master' of ssh://3dhosting.de/var/git/careminster into ubitworkUbitUmarov2012-02-2311-31/+94
| |\ \ \
| * | | | fix the last fix. Regions are square but... Also remove the 0.5 offset in ↵UbitUmarov2012-02-231-1/+3
| | | | | | | | | | | | | | | | | | | | map position. It was apparently needed to fix we having nsamples = size and not size + 1.
| * | | | fix my bug on ChODE terrain heightmap buildUbitUmarov2012-02-231-3/+3
| | | | |
* | | | | Show avatars as sitting on proot prims only to avoid motion jitterMelanie2012-02-231-5/+31
| |/ / / |/| | | | | | | | | | | for passengers
* | | | Merge branch 'master' into careminsterMelanie2012-02-238-29/+28
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Framework/EntityTransfer/EntityTransferModule.cs
| * | | 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.
* | | | Add permission checks to scripted object movements, which didn't respect bansMelanie2012-02-233-1/+59
| | | | | | | | | | | | | | | | | | | | and parcel settings until now. Add llSetRegionPos() function according to LL spec
* | | | Count agents for LSL instead of relying on SceneGraph to have the correctMelanie2012-02-221-1/+7
| |/ / |/| | | | | | | | value. Fixes a reported glitch.
* | | Adjust sit target and the llSetLinkPrimitiveParams sit position hackMelanie2012-02-222-16/+68
| | | | | | | | | | | | to match SL.
* | | Merge branch 'master' into careminsterMelanie2012-02-211-0/+9
|\ \ \ | |/ /
| * | 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.
* | | Merge branch 'master' into careminsterMelanie2012-02-211-1/+1
|\ \ \ | |/ /
| * | Fix:LINK_ROOT flag for llGetLinkName() by SinglePrimPixelTomsen2012-02-211-1/+1
| | |
* | | Merge branch 'master' into careminsterMelanie2012-02-212-35/+5
|\ \ \ | |/ /