aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/bin (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminster-presence-refactorMelanie2010-05-211-0/+0
|\
| * Replace CSJ2K with fixed version (Mantis #3318)Melanie2010-05-211-0/+0
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-211-0/+0
|\ \ | |/
| * Merge branch 'Migrations'Melanie2010-05-181-0/+0
| |\ | | | | | | | | | | | | | | | | | | This merges AlexRa's work on migration streamlining. This merge is experimental. If it causes issues, feel free to back out. Signed-off-by: Melanie <melanie@t-data.com>
| | * Embedded MySql.Data.dll updated to 6.2.3.0.AlexRa2010-05-161-0/+0
| | | | | | | | | | | | | | | This is necessary to correct a known problem with the DELIMITER command in previous versions of the client library.
| * | Allow remote admin to be used on a different port from the main region portMelanie Thielker2010-05-181-0/+4
| | |
* | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-05-211-1/+0
|\ \ \
| * \ \ Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-05-212-3/+12
| |\ \ \
| | * | | back port groups changesunknown2010-05-051-5/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Melanie <melanie@t-data.com>
| | * | | back port groups changesunknown2010-05-052-3/+17
| | | | |
| * | | | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-195-0/+0
| |\ \ \ \ | | |/ / /
| | * | | Update OpenMetaverse libraries to those used in master as of commit 9a781e7Justin Clark-Casey (justincc)2010-04-185-0/+0
| | | | | | | | | | | | | | | | | | | | This removes Mono.Security.dll which might help with Mono 2.6.3 compatability issues (notwithstanding the sqlite problem)
| | * | | remove milliseconds from console log againJustin Clark-Casey (justincc)2010-03-091-1/+1
| | | | |
| | * | | Fix bug where approximately half the time, attachments would rez only their ↵Justin Clark-Casey (justincc)2010-03-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. Backport from head.
| * | | | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-03-062-36/+35
| |\ \ \ \ | | |/ / /
* | | | | Allow remote admin to be used on a different port from the main region portMelanie Thielker2010-05-181-0/+4
| | | | |
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-162-6/+0
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | * Fixed configs in StandaloneHypergrid.ini, it still had the SQLite ↵Diva Canto2010-05-161-3/+0
| | |_|/ | |/| | | | | | | | | | | | | | | | | | connection strings. * Added a comment in LLLoginService.cs, for future reference
| * | | Removed the unreferenced MaxPrimsPerFrame from OpenSim.ini.exampleunknown2010-05-121-3/+0
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-091-0/+1
|\ \ \ \ | |/ / /
| * | | Implement the "delete" path for assets. Adds a new option to allow remote ↵Melanie2010-05-091-0/+1
| | | | | | | | | | | | | | | | asset deletion in robust handler.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-091-0/+3
|\ \ \ \ | |/ / /
| * | | * Added missing loggout notification to home grid upon agents logging out in ↵Diva Canto2010-05-081-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | foreign grids. * Added missing config in StandaloneHypergrid.ini
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-088-68/+97
|\ \ \ \ | |/ / /
| * | | GridUserService in place. Replaces the contrived concept of storing user's ↵Diva Canto2010-05-078-68/+97
| | | | | | | | | | | | | | | | | | | | | | | | home and position info in the presence service. WARNING: I violated a taboo by deleting 2 migration files and simplifying the original table creation for Presence. This should not cause any problems to anyone, though. Things will work with the new simplified table, as well as with the previous contrived one. If there are any problems, solving them is as easy as dropping the presence table and deleting its row in the migrations table. The presence info only exists during a user's session anyway. BTW, the Meshing files want to be committed too -- EOFs.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-063-1/+8
|\ \ \ \ | |/ / /
| * | | * Fixes Library bugs in grid mode. Partly a missing check and partly a ↵Diva Canto2010-05-053-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | missing configuration. * Made previous Robust config changes consistent in Robust.HG.ini.example
| * | | Add a XMLRPC method to remotely set the login level for the LLLoginService.Melanie Thielker2010-05-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This requires a special XMLRPC call, which has to supply the credentials of a god user (User level >= 200). Disabled by default. Also Adds a configuration option to set the initial permitted login level.
* | | | Add a XMLRPC method to remotely set the login level for the LLLoginService.Melanie Thielker2010-05-051-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | This requires a special XMLRPC call, which has to supply the credentials of a god user (User level >= 200). Disabled by default. Also Adds a configuration option to set the initial permitted login level.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-05-037-21/+23
|\ \ \ \ | |/ / /
| * | | Switched everything to XInventory by default. The old Inventory is still ↵Diva Canto2010-05-027-21/+23
| | | | | | | | | | | | | | | | there for now, in case bugs pop up with XInventory.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-303-8/+12
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-04-301-0/+0
| |\ \ \
| * | | | rename SQLiteNG to SQLite and SQLite to SQLiteLegacyJustin Clark-Casey (justincc)2010-04-303-10/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this seems the least evil way forward since mono 2.6 and later will see increasing usage, and this only works with what was SQLiteNG MAC USERS WILL NEED TO CHANGE REFERENCES TO "OpenSim.Data.SQLite.dll" to "OpenSim.Data.SQLiteLegacy.dll" in OpenSim.ini and config-include/StandaloneCommon.ini (if using standalone) See the OpenSim.ini.example and StandaloneCommon.ini.example files for more details This commit also temporarily changes unsigned ParentEstateID values in the OpenSim.Data.Tests to signed temporarily, since the new plugin enforces creation of signed fields in the database (which is what the SQL actually specifies). And change data columns in sqlite is a pita.
| * | | | Make SQLiteNG the default since it actually does work with Mono 2.4 on Linux.Justin Clark-Casey (justincc)2010-04-302-9/+13
| | | | | | | | | | | | | | | | | | | | | | | | | I know this is tough on Mac OSX users (since SQLiteNG requires the export of the sqlite3_column_origin_name symbol and this isn't present for the Mac OSX sqlite3 system library) Unfortunately, I need to shaft somebody (as it were)
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-291-0/+0
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | update Mono.Data.Sqlite.dll to the one that shipped with Mono 2.6.3, which ↵justincc2010-04-271-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is the one known to work in Windows Thanks for the initial library inclusion, Diva. I had it all queued up on my windows test machine but forgot to add it!
* | | | | 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
| | | |