aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| | * | | minor: Log number of region modules loaded from each pluginJustin Clark-Casey (justincc)2013-03-021-1/+23
| | | | |
| * | | | Fixed typos in TempAttachmentsModule. No changes.Diva Canto2013-03-021-1/+1
| |/ / /
* | | | Merge branch 'avination' into careminsterMelanie2013-03-0315-59/+122
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Interface/IOSSL_Api.cs
| * | | Make Keyframe motion cross regions againMelanie2013-03-032-2/+4
| | | |
| * | | Make a viewer sent XML error prettierMelanie2013-03-031-0/+4
| | | |
| * | | Reinstate uploading temporary texturesMelanie2013-02-271-4/+4
| | | |
| * | | Try to update inventory items when there is a valid asset - may fix temp ↵Melanie2013-02-271-0/+5
| | | | | | | | | | | | | | | | textures
| * | | Remove osParseJSONNew because it's "object" return type is not useful for LSLroot2013-02-253-7/+1
| | | |
| * | | Make banking no longer break sit rotations. Fix spinning avatars.Melanie2013-02-251-3/+6
| | | |
| * | | Revert "Output some additional data on Vivox connection errors", this logs ↵Melanie2013-02-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | passwords! Bad! This reverts commit 79e477f6af09fae2d88a1bba45de6cb819e2800a.
| * | | Output some additional data on Vivox connection errorsMelanie2013-02-241-1/+1
| | | |
| * | | The viewer tries to parse the error message body to LLSD - give it some.Melanie2013-02-241-2/+2
| | | |
| * | | Revert "Allow TeleportCancel packets to reset the transfer state machine"Melanie2013-02-241-6/+0
| | | | | | | | | | | | | | | | This reverts commit 0e17887e03fb6d32cdd07838caa56e34103ae8f2.
| * | | Fix an issue where the viewer would request the seed cap beforeMelanie2013-02-185-34/+81
| | | | | | | | | | | | | | | | there was a handler for it.
| * | | Correctly remove https:// URLs from the http server.Melanie2013-02-171-1/+7
| | | |
| * | | Fix shape parameters sent for meshes tosupport the full number of facesMelanie2013-02-161-0/+8
| | | |
* | | | Merge branch 'master' into careminsterMelanie2013-03-0114-171/+220
|\ \ \ \ | | |/ / | |/| |
| * | | Moved permissions config vars out of [Startup] into [Permissions]. Backwards ↵Diva Canto2013-03-014-115/+129
| | | | | | | | | | | | | | | | compatible ([Startup] still being looked up), but please update your configs sometime soon.
| * | | Removed more vars from [Startup]. I think these were already moved ↵Diva Canto2013-03-011-20/+0
| | | | | | | | | | | | | | | | elsewhere, because I can't find any reference to them in the code.
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-014-15/+63
| |\ \ \
| | * | | BulletSim: more things into the TODO list.Robert Adams2013-03-011-1/+6
| | | | |
| | * | | BulletSim: add parameters, code cleanup around checking and enforcingRobert Adams2013-03-013-14/+57
| | | | | | | | | | | | | | | | | | | | maximum velocity and angular velocity values for prims.
| * | | | Add the Mono AddinDependency attribute to the example region modules.Justin Clark-Casey (justincc)2013-03-012-2/+4
| |/ / / | | | | | | | | | | | | It turns out this is required to get Mono.Addins to pick up plugin DLLs
| * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-03-012-19/+16
| |\ \ \
| | * | | Add missing prebuild.xml dependency for System.Action2<t1,t2> in recent ↵Robert Adams2013-02-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | additions to ScriptEngine tests. Compiles some places but not others.
| | * | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-289-43/+366
| | |\ \ \
| | * | | | Bug fix in DataSnapshot, where a var was being used before being initialized.Diva Canto2013-02-281-19/+15
| | | |_|/ | | |/| |
| * | | | minor: Log location in which simulator/robust was started.Justin Clark-Casey (justincc)2013-02-282-0/+8
| | |/ / | |/| | | | | | | | | | Useful information for system debugging, especially if logging and ini files locations have been changed from defaults.
* | | | Merge branch 'master' into careminsterMelanie2013-02-2836-127/+538
|\ \ \ \ | |/ / / | | | | | | | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneManager.cs
| * | | Fix potential concurrency issue since the LSL notecard cache was not being ↵Justin Clark-Casey (justincc)2013-02-281-7/+10
| | | | | | | | | | | | | | | | checked for expiry under lock
| * | | Fix bug where simultaneous calls by different scripts to llGetNotecardLine() ↵Justin Clark-Casey (justincc)2013-02-281-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | or llGetNumberOfNotecardLines() would sometimes not trigger a dataserver event. This was because the notecard asset ID was being used as the request identifier. Now using a random ID, in common with other code using the DataServer
| * | | Add regression tests for llGetNotecardLine()Justin Clark-Casey (justincc)2013-02-288-24/+342
| |/ /
| * | Robust.HG.ini.example updated to get an [Hypergrid] section too.Diva Canto2013-02-281-14/+15
| | |
| * | Removed duplicate 'using' statement.Diva Canto2013-02-271-1/+0
| | |
| * | Switched to using the other Util function with a default value.Diva Canto2013-02-2712-14/+28
| | |
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDiva Canto2013-02-2739-302/+722
| |\ \
| | * | Add comment to example region modules about need to add Assembly annotation ↵Justin Clark-Casey (justincc)2013-02-272-0/+10
| | | | | | | | | | | | | | | | if adding modules to a DLL which does not already have this
| | * | Get "show modules" console command to obey selected command line region/sJustin Clark-Casey (justincc)2013-02-273-18/+13
| | | |
| | * | Get "show modules" console command to show modules in alphabetical order, ↵Justin Clark-Casey (justincc)2013-02-271-7/+20
| | | | | | | | | | | | | | | | | | | | | | | | and group shared and non-shared modules together This is to make it easier to tell if a region has a certain module active or not
| | * | Do not have the Freeswitch connector on by default in Robust ini example files.Justin Clark-Casey (justincc)2013-02-272-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | This is not widely used (may even be currently broken), only allows very poor quality voice (not the fault of FreeSwitch) and requires a complicated Freeswitch setup. Having it on but not configured results in spurious warnings in the logs
| | * | Add asset name and description truncation warnings to SQLite database plugin ↵Justin Clark-Casey (justincc)2013-02-271-5/+23
| | | | | | | | | | | | | | | | for consistency.
| | * | Add more information to warnings logged when asset names and descriptions ↵Justin Clark-Casey (justincc)2013-02-273-6/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | have to be truncated for database storage On balance, I still think this is useful because asset names and descriptions can sometimes be helpful in determining what things are. Even though they are never subsequently (inventory names/descriptions are always used instead).
| * | | Moved the HG default variables out of [Startup] and into their own section ↵Diva Canto2013-02-2715-31/+55
| | | | | | | | | | | | | | | | [Hypergrid] in *Common.ini.example. Backwards compatible for now.
* | | | Merge branch 'master' into careminsterMelanie2013-02-275-13/+273
|\ \ \ \ | | |/ / | |/| | | | | | | | | | Conflicts: OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs
| * | | minor: remove some mono compiler warnings in script regression testsJustin Clark-Casey (justincc)2013-02-272-2/+1
| | | |
| * | | Show http poll handlers in separate http (poll) section of "show ↵Justin Clark-Casey (justincc)2013-02-271-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | http-handlers" console command instead of never showing them (due to a previous bug). The code was assuming that poll handlers were also included in general http handlers but this was not the case.
| * | | Add regression test for llReleaseUrl() (and for llRequestUrl)Justin Clark-Casey (justincc)2013-02-272-9/+266
| | | | | | | | | | | | | | | | Forgot to add file for llRequestUrl() test in commit b8a7c8b
* | | | Merge branch 'master' into careminsterMelanie2013-02-2722-221/+314
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/RegionLoader/Web/RegionLoaderWebServer.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/CoreModules/World/WorldMap/WorldMapModule.cs
| * | | Improve description of GenerateMapTiles config optionJustin Clark-Casey (justincc)2013-02-271-7/+8
| | | |
| * | | Add documentation on default or Warp3D image module choice to ↵Justin Clark-Casey (justincc)2013-02-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSim.ini.example. As before, default is MapImageModule. Thanks to Ai Austin for pointing out this omission.