aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-04-277-9/+26
|\
| * Uncommenting SQLiteNG project again. I found a Mono.Data.Sqlite.dll that ↵Diva Canto2010-04-261-0/+0
| | | | | | | | makes the compilation in Windows happy again. Not sure if this is the right dll, Justin -- I grabbed it somewhere from mono 2.4.6 for Windows.
| * Add instructions for using SQLiteNG to OpenSim.ini and ↵Justin Clark-Casey (justincc)2010-04-233-4/+26
| | | | | | | | | | | | config-include/StandaloneCommon.ini Unfortunately, database settings need to be changed in two places.
| * remove [DatabaseService] section from OpenSim.ini since this is always ↵Justin Clark-Casey (justincc)2010-04-231-4/+0
| | | | | | | | present in included configuration files
| * minor: eliminate configuration section handling deprecation of ↵Justin Clark-Casey (justincc)2010-04-231-1/+0
| | | | | | | | OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time
| * Renamed OpenSim.Server.exe to Robust.exe and corresponding .ini's and config.Diva Canto2010-04-223-0/+0
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-192-0/+32
|\ \ | |/
| * This version of the launcher exe works.Diva Canto2010-04-141-0/+0
| |
| * * Added 32bitLauncher for Robust. Still need to test it on a 64 bit machine.Diva Canto2010-04-142-0/+32
| | | | | | | | * PrimitiveBaseShape wants to be be committed too -- EOF.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-053-3/+27
|\ \ | |/
| * Updates to config files for groupsunknown2010-04-043-3/+27
| | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| * Adding the configuration exampleMelanie2010-03-311-0/+6
| |
* | Rename Meta7Windlight to LightShareMelanie2010-03-301-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-305-0/+0
|\ \ | |/
| * Hippos with bin/Newtonsoft.Json.XMLDiva Canto2010-03-261-5827/+5827
| |
| * put out full exception stack if something reaches top of base http server ↵Justin Clark-Casey (justincc)2010-03-251-5827/+5827
| | | | | | | | | | | | OnRequest() on both mono and .net replace Newtonsoft.Json.XML since the updated copy got accidentally reverted by another commit
| * * Updated libomv libraries to fix JSON (LLSD) decoding errors on null values ↵John Hurliman2010-03-205-0/+0
| | | | | | | | | | | | and remove the unused OpenMetaverse.Http.dll and Mono.Security.dll * Fixed a password hash comparison error in SimianAuthenticationServiceConnector.Authenticate()
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-182-8/+1
|\ \ | |/
| * Removed the unused use_async_when_possible config variableJohn Hurliman2010-03-161-7/+0
| |
| * Fixed a bad module name in SimianGrid.iniJohn Hurliman2010-03-151-1/+1
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-1510-463/+5379
|\ \ | |/
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-121-18/+22
| |\
| | * start laoding griduser local connector, though it isn't invoked by anything yetJustin Clark-Casey (justincc)2010-03-121-18/+22
| | |
| * | * Added a better check to the SimianGrid connectors to test if they are ↵John Hurliman2010-03-123-5827/+5827
| |/ | | | | | | | | | | enabled or not. This method should work equally well with standalone or robust mode * Applying #4602 from Misterblu to add collision detection to BulletDotNET
| * Simplify database setup and remove migration problems by moving all sqlite ↵Justin Clark-Casey (justincc)2010-03-123-13/+30
| | | | | | | | | | | | | | | | | | config-include settings to a separate file for standalone Update information in StandaloneCommon.ini.example to reflect this Remove ISharedRegionModule interfaces from all SimianGrid connector classes temporarily since this stopped standalone from working (due to absence of AssetURI settings, etc.). Solution here may be to create separate region module connectors as done by local/grid/hypergrid so that loading can be controlled via include files Or otherwise work out how to stop these modules from being loaded for all OpenSim invocations
| * Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-03-122-0/+58
| |\
| | * Fixed SimianGrid.ini to use GridCommon.ini(.example)John Hurliman2010-03-121-34/+21
| | |
| | * Adding the SimianGrid connectorsJohn Hurliman2010-03-112-0/+71
| | |
| * | Upgrade Newtonsoft.Json.dll from 1.3 to 3.5r6Justin Clark-Casey (justincc)2010-03-113-990/+5827
| |/ | | | | | | Actually using the one built against Net 2.0 (labelled Newtonsoft.Json.Net20.dll) since the 3.5 build is not compatible with Mono 2.4 (though it is with Mono 2.6)
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-095-2/+4
|\ \ | |/
| * Add config option for switching between CSJ2K and BuggyJPEG.Melanie2010-03-081-0/+4
| |
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-03-071-2/+0
| |\
| | * Removed obsolete configs.Diva Canto2010-03-071-2/+0
| | |
| * | * Updated to libomv r3268 which fixes the mapping for OpenJPEG on 64-bit ↵John Hurliman2010-03-073-0/+0
| |/ | | | | | | systems and adds protocol support for Viewer 2.0 (still needs work in OpenSim to get things fully functional)
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-062-0/+0
|\ \ | |/
| * revert accidental Standalone.ini changeJustin Clark-Casey (justincc)2010-03-051-9/+10
| |
| * add initial UserGrid service classes as per diva's directionJustin Clark-Casey (justincc)2010-03-051-10/+9
| | | | | | | | | | this will initially store home location data instead of the presence service compiles but not enough to actually test yet
| * Replaced BclExtras.dll with a newer version compiled for .NET 3.5. This ↵Diva Canto2010-03-042-0/+0
| | | | | | | | solves the compilation errors that have been affecting build on Windows for the past day. Thanks lkalif for noticing the conflict.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-041-3/+5
|\ \ | |/
| * reset the accidental local configuration changesJustin Clark-Casey (justincc)2010-03-032-8/+10
| |
| * Fix bug where approximately half the time, attachments would rez only their ↵Justin Clark-Casey (justincc)2010-03-032-5/+5
| | | | | | | | | | | | | | | | root prim until right clicked (or otherwise updated). The root cause of this problem was that multiple ObjectUpdates were being sent on attachment which differed enough to confuse the client. Sometimes these would eliminate each other and sometimes not, depending on whether the scheduler looked at the queued updates. The solution here is to only schedule the ObjectUpdate once the attachment code has done all it needs to do.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-033-46/+93
|\ \ | |/
| * * Better debug message on login problems.Diva Canto2010-03-023-46/+93
| | | | | | | | * Moved GridInfoService config to OpenSim.Server.ini
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-03-0312-208/+529
|\ \ | |/ | | | | This brings careminster on the level of master. To be tested
| * Merge branch 'master' into presence-refactorMelanie2010-03-012-34/+33
| |\
| | * Minor formatting cleanup.Jeff Ames2010-02-222-36/+35
| | |
| * | Added FriendsData to both Null storage and SQLite. Untested.Diva Canto2010-02-282-0/+8
| | |
| * | * Friends out connector completed. Grid login retrieves friends correctly.Diva Canto2010-02-265-4/+19
| | | | | | | | | | | | * Added friends configs to grid .inis
| * | Added server-side Friends in connector. Untested.Diva Canto2010-02-254-0/+8
| | |
| * | List of friends now retrieved upon login. Configured and tested in ↵Diva Canto2010-02-252-3/+11
| | | | | | | | | | | | standalone only.