aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'master' into v3_supportBlueWall2012-03-0222-317/+256
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of /home/opensim/src/opensim into v3_supportBlueWall2012-02-291-2/+2
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensim into v3_supportBlueWall2012-02-2521-103/+276
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into v3_supportBlueWall2012-02-2211-48/+32
| |\ \ \ \ \ \ \
| * | | | | | | | V3 SupportBlueWall2012-02-222-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The V3 webapps need SSO capability and use OpenID. We need to send both our OpenID server url and a token for the user in the login response.
| * | | | | | | | V3 Support:BlueWall2012-02-212-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This starts V3 support by adding a profile server url to the login response. This requires viewer support - which is also being worked on.
* | | | | | | | | Merge branch 'master' into careminsterMelanie2012-03-0322-321/+255
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/Servers/VersionInfo.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * | | | | | | | Remove outdated comment about checking attachment prims in ↵Justin Clark-Casey (justincc)2012-03-021-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Scene.PipeEventsForScript()
| * | | | | | | | Allow a script to receive events if its root prim is in an area where it's ↵Justin Clark-Casey (justincc)2012-03-021-4/+1
| | |_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allowed to run rather than checking its own prim. This allows scripts to run in child prims that are outside region boundaries. This is an interim patch applied from http://opensimulator.org/mantis/view.php?id=5899 though it does not resolve that bug Thanks tglion!
| * | | | | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2012-03-022-4/+12
| |\ \ \ \ \ \ \
| | * | | | | | | minor: remove mono compiler warningJustin Clark-Casey (justincc)2012-03-021-2/+1
| | | | | | | | |
| | * | | | | | | Send the right name and creation date on the BasicProfileModule.Diva Canto2012-03-011-2/+11
| | | | | | | | |
| * | | | | | | | ScenePresence line endings and fix AllowMovement default to true.Dan Lake2012-03-021-30/+30
| |/ / / / / / /
| * | | | | | | In ScenePresence, removed several private variables used to store public ↵Dan Lake2012-03-011-108/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | parameters. They were only used by the get/set and make code harder to refactor.
| * | | | | | | minor: Rename pCampbot console prompt to "pCampbot" rather than "Region"Justin Clark-Casey (justincc)2012-03-021-1/+1
| | | | | | | |
| * | | | | | | Provide feedback on bot login states in pCampbotJustin Clark-Casey (justincc)2012-03-021-0/+7
| | | | | | | |
| * | | | | | | Move SenseRepeaters.Count check inside the SenseRepeatListLock.Justin Clark-Casey (justincc)2012-03-021-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No methods in the List class are thread safe in the MS specification/documentation
| * | | | | | | lock SenseRepeatListLock when added a new sensor during script reconstitution.Justin Clark-Casey (justincc)2012-03-021-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is already being done in the other place where a sensor is added. Adding a sensor whilst another thread is iterating over the sensor list can cause a concurrency exception.
| * | | | | | | Adds an OSSL command for regular expression-based string replacement. ParametersMic Bowman2012-03-013-0/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | are osReplaceString(string source, string patter, string replace, integer count, integer start) The count parameter specifies the total number of replacements to make, -1 makes all replacements.
| * | | | | | | 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.
| * | | | | | | | Flick master up to 0.7.4Justin Clark-Casey (justincc)2012-02-291-1/+1
| |/ / / / / / /
| * | | | | | | 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.
| * | | | | | | 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-254-34/+111
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | | | Remove EXPERIMENTAL tags from load iar/save iar commands.Justin Clark-Casey (justincc)2012-02-251-3/+0
| | | | | |
| * | | | | 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
| * | | | 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
* | | | Partially apply the core banlines fixMelanie2012-02-232-6/+9
| |_|/ |/| |
* | | 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
|\ \ \
generated by cgit v1.1 at 2024-12-23 17:21:42 +0000