aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-04-3079-788/+564
| |\ \ \ \
| | * | | | * XInventory fairly tested, including for HG. Almost ready to switch.Diva Canto2010-04-309-365/+140
| | |/ / / | | | | | | | | | | | | | | | * Removed a few buglets and added better exception handling.
| | * | | take out some debug logging in the sqlite db adaptorJustin Clark-Casey (justincc)2010-04-301-3/+3
| | | | |
| | * | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-04-3030-233/+1420
| | |\ \ \
| | * | | | rename SQLiteNG to SQLite and SQLite to SQLiteLegacyJustin Clark-Casey (justincc)2010-04-3070-422/+423
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | Fix a null ref from trying to access a dictionary that was never initialized.Melanie2010-04-301-1/+2
| | |/ / / | |/| | |
| * | | | Fix some symbol errorsMelanie2010-04-301-2/+2
| | | | |
* | | | | Fix linking issue introduced in my earlier commitMelanie Thielker2010-04-301-1/+19
| | | | |
* | | | | Fix some symbol errorsMelanie2010-04-301-2/+2
| | | | |
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-304-281/+284
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-04-302-279/+282
| |\ \ \ \
| | * | | | Simplified RemoteXInventoryServiceConnector and HGBroker (2) by a lot.Diva Canto2010-04-292-279/+282
| | | | | |
| * | | | | Fix link security issueMelanie2010-04-307-43/+70
| |/ / / /
* | | | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-307-41/+68
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-307-41/+68
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fix link security issueMelanie2010-04-307-41/+68
| | | | |
* | | | | Treat a UserLevel of -1 as an unverified account and refer them to theirMelanie2010-04-302-0/+11
| | | | | | | | | | | | | | | | | | | | activation email.
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-2916-150/+875
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Started redoing HGInventoryBroker for XInventory and with multi-protocol in ↵Diva Canto2010-04-294-3/+648
| | | | | | | | | | | | | | | | | | | | mind. Unfinished.
| * | | | Merge branch 'minor-stuff'Melanie2010-04-287-67/+74
| |\ \ \ \
| | * | | | Refactoring in Migration.cs: "using()" instead of explicit Dispose()AlexRa2010-04-281-52/+56
| | | | | | | | | | | | | | | | | | | | | | | | This ensures that 'cmd' gets disposed on errors
| | * | | | Fixed comments in Migration.cs: wrong argument order (no change to code)AlexRa2010-04-281-2/+2
| | | | | |
| | * | | | Compiler.cs contained method GetCompilerOutput which, apparently,unknown2010-04-281-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | was not used, but exactly the same path was calculated inline. This patch does some minor refactoring by replacing inline path calculation with GetCompilerOutput. This doesn't actually affect anything, just minor prettifying of the code
| | * | | | Just a bit of spellchecking in the commentsAlexRa2010-04-281-2/+2
| | | | | |
| | * | | | Spelling in FriendsModule.cs: "filed to load" -> "failed to load"unknown2010-04-281-1/+1
| | | | | |
| | * | | | Minor spelling corrections in MiniModule: "RetreiveAsset" changed tounknown2010-04-282-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | "RetrieveAsset" and 'm_rootSceene' to m_rootScene'.
| | * | | | Removed unused var from InventoryService.cs (-1 warning)AlexRa2010-04-281-1/+1
| | | | | |
| * | | | | Commented verbose debug messages from XInventory handler.Diva Canto2010-04-281-13/+13
| | | | | |
| * | | | | Putting it back to protected; Melanie doesn't like it to be public.Diva Canto2010-04-271-1/+1
| | | | | |
| * | | | | Changed GetToken from protected to public. This is not exposed at the interface.Diva Canto2010-04-271-1/+1
| | | | | |
| * | | | | * Thanks cmickeyb, for a patch that sanity checks if the response from ↵John Hurliman2010-04-271-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | m_Database.GetAsset(assetID) is null in AssetService.cs
| * | | | | * Thanks cmickeyb, for a patch that corrects an invalid construction of ↵John Hurliman2010-04-271-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Primitive.TextureEntry (a "blank" texture should be initialized with UUID.Zero, not null)
| * | | | | XInventory connector/handler showing signs of life. Tested, but needs more ↵Diva Canto2010-04-275-69/+139
| |/ / / / | | | | | | | | | | | | | | | testing.
* | | | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-292-43/+45
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Fix Av jump motion S/WKitto Flora2010-04-291-2/+2
| | | | |
| * | | | Fix vertical attractorKitto Flora2010-04-291-41/+43
| | | | |
* | | | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-272-11/+21
|\ \ \ \ \ | |/ / / /
| * | | | Adding some more SNMP events and some refactoringsacha2010-04-232-8/+14
| | | | | | | | | | | | | | | | | | | | Signed : The Masqued Foxi
| * | | | Adding LinkUp/LinkDown when a region is started or stoped.sacha2010-04-232-3/+7
| | | | | | | | | | | | | | | | | | | | Those two events could be used to compute the region availibility
| * | | | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-192-17/+48
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Fix http://opensimulator.org/mantis/view.php?id=4657 where ↵Justin Clark-Casey (justincc)2010-04-162-17/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | OpenSim.Grid.UserServer.exe fails on startup if no previous config probably appears to occur because mono 2.4.2.3 (and possibly later) erroneously returns a value of 0 for BufferWidth and BufferHeight in some circumstances
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-276-18/+442
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-04-273-1/+400
| |\ \ \ \
| | * | | | RemoteXInventoryServiceConnector, the plugin region module. Not active in ↵Diva Canto2010-04-263-1/+400
| | | | | | | | | | | | | | | | | | | | | | | | default configs yet.
| * | | | | Allow a client to pass a scope id to log into in the login XML / LLSDMelanie2010-04-273-17/+42
| |/ / / /
| * | | | Fix build break.Melanie2010-04-271-17/+17
| | | | |
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-2764-18/+6179
|\ \ \ \ \ | |/ / / /
| * | | | Add a parameter to prim inventory update to prevent event firingMelanie2010-04-272-18/+26
| | | | |
| * | | | Better error message.Diva Canto2010-04-261-1/+1
| | | | |
| * | | | * Commenting SQLiteNG out of prebuild.xml, because it's making compile fail ↵Diva Canto2010-04-261-2/+2
| | |_|/ | |/| | | | | | | | | | | | | | | | | | in Windows. Justin: you forgot to add Mono.Sqlite.dll, and I can't figure out where to grab it from! * IRegionModule.cs wants to be committed too -- EOF.