aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2012-03-044-4/+44
|\
| * Merge branch 'master' of /home/opensim/var/repo/opensim into v3_supportBlueWall2012-03-042-8/+3
| |\
| | * comment out "[CAPS]: ScriptTaskInventory Request" log spamJustin Clark-Casey (justincc)2012-03-021-1/+1
| * | OpenID auth needs hashing before authenticatingBlueWall2012-03-022-2/+2
| * | 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
| * | | | | | V3 Support:BlueWall2012-02-212-2/+22
* | | | | | | Merge branch 'master' into careminsterMelanie2012-03-0322-321/+255
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | |
| * | | | | | Remove outdated comment about checking attachment prims in Scene.PipeEventsFo...Justin Clark-Casey (justincc)2012-03-021-3/+1
| * | | | | | Allow a script to receive events if its root prim is in an area where it's al...Justin Clark-Casey (justincc)2012-03-021-4/+1
| | |_|_|_|/ | |/| | | |
| * | | | | 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 para...Dan Lake2012-03-011-108/+44
| * | | | | 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
| * | | | | lock SenseRepeatListLock when added a new sensor during script reconstitution.Justin Clark-Casey (justincc)2012-03-021-1/+3
| * | | | | Adds an OSSL command for regular expression-based string replacement. ParametersMic Bowman2012-03-013-0/+32
| * | | | | Merge branch 'master' of /home/opensim/src/opensimBlueWall2012-03-011-1/+1
| |\ \ \ \ \
| | * | | | | Fix indexing on string trimBlueWall2012-03-011-1/+1
| * | | | | | Use a fully stubbed out MockConsole for unit tests rather than inheriting fro...Justin Clark-Casey (justincc)2012-03-012-23/+38
| * | | | | | 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
| * | | | | 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
| * | | | Use correct casing of RegionSettings.Sandbox in the various database modules.Justin Clark-Casey (justincc)2012-02-293-4/+4
| * | | | 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
| | * | | | 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 th...Diva Canto2012-02-251-1/+1
| | | |_|/ | | |/| |
| * | | | 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
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | PRIM_SCULPT_FLAG_INVERT, PRIM_SCULPT_FLAG_MIRROR implementedPixelTomsen2012-02-252-4/+8
| |/ / /
| * | | Remove EXPERIMENTAL tags from load iar/save iar commands.Justin Clark-Casey (justincc)2012-02-251-3/+0
| * | | llGetLinkMedia, llSetLinkMedia, llClearLinkMedia implementation mantis: http:...PixelTomsen2012-02-243-27/+105
* | | | 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
| * | | Rename Watchdog.GetThreads() to GetThreadsInfo() to reflect what it actually ...Justin Clark-Casey (justincc)2012-02-242-2/+2
| * | | 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
| * | | In osSetSpeed(), if no avatar for a uuid is found then don't attempt to set s...Justin Clark-Casey (justincc)2012-02-241-1/+3
| * | | 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
| * | | Try to resolve some problems with viewers crashing after hitting parcel banli...Justin Clark-Casey (justincc)2012-02-233-16/+41
| |/ /