aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
* remove unnecessary hash local variableJustin Clark-Casey (justincc)2012-03-051-2/+0
|
* Make asset compression optional. Currently set to false and not ↵Justin Clark-Casey (justincc)2012-03-031-16/+24
| | | | configurable from outside MySQLXAssetData.
* Implement basic gzip compression for xassetdataJustin Clark-Casey (justincc)2012-03-031-10/+41
| | | | | | Whether this is worthwhile is debatable since here we are not transmitting data over a network In addition, jpeg2000 (the biggest data hog) is already a compressed image format. May not remain.
* If asset data already exists with the required hash then don't rewrite itJustin Clark-Casey (justincc)2012-03-031-17/+59
|
* Perform asset storage transactionallyJustin Clark-Casey (justincc)2012-03-021-57/+69
|
* Merge branch 'master' into xassetserviceJustin Clark-Casey (justincc)2012-03-024-40/+34
|\
| * comment out "[CAPS]: ScriptTaskInventory Request" log spamJustin Clark-Casey (justincc)2012-03-021-1/+1
| |
| * 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
| | |
| * | ScenePresence line endings and fix AllowMovement default to true.Dan Lake2012-03-021-30/+30
| | |
* | | Make xassetservice execute one query to retrieve the asset, not twoJustin Clark-Casey (justincc)2012-03-021-28/+4
| | |
* | | Merge branch 'master' into xassetserviceJustin Clark-Casey (justincc)2012-03-022-110/+55
|\ \ \ | | |/ | |/|
| * | Send the right name and creation date on the BasicProfileModule.Diva Canto2012-03-011-2/+11
| |/
| * 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.
* | Make XAssetService a de-duplicating asset service.Justin Clark-Casey (justincc)2012-03-022-0/+443
| | | | | | | | | | | | | | This is an extremely crude implemenation which almost works by accident. Nevertheless it does work. It can be tested with the instructions at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service#Testing It does not interact at all with the existing asset service or any data stored there. This code is subject to change without notice and should not be used for anything other than gawking.
* | Start by adding XAssetService as a copy of the existing AssetService.Justin Clark-Casey (justincc)2012-03-022-2/+218
|/ | | | | | | | This is the start of exploring the creation of a bundled OpenSimulator asset service that does de-duplication and possibly file storage of assets. Along the lines of coyled's SRAS, but not intended to replace, merely to act as a more performant bundled default. Might end up nicking stuff from kcozen's patch at http://opensimulator.org/mantis/view.php?id=5429 More details at http://opensimulator.org/wiki/Feature_Proposals/Deduplicating_Asset_Service Feedback and discussion welcome as commits are made.
* 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.
| * | 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
|/ /
* | 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
* | 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.