aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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-2918-150/+884
|\ \ \
| * | | Started redoing HGInventoryBroker for XInventory and with multi-protocol in ↵Diva Canto2010-04-294-3/+648
| | | | | | | | | | | | | | | | mind. Unfinished.
| * | | Merge branch 'minor-stuff'Melanie2010-04-288-67/+83
| |\ \ \
| | * | | 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
| | | | |
| | * | | removed from git *.VisualState.xml (automatically created by NUnit)AlexRa2010-04-281-0/+1
| | | | |
| | * | | Removed from git .../obj directories (created by VStudio)AlexRa2010-04-281-0/+8
| | | | |
| * | | | 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)
| * | | | 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!
| * | | | 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 '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-2772-28/+6243
|\ \ \ \ | |/ / /
| * | | Add a parameter to prim inventory update to prevent event firingMelanie2010-04-272-18/+26
| | | |
| * | | Better error message.Diva Canto2010-04-261-1/+1
| | | |
| * | | Uncommenting SQLiteNG project again. I found a Mono.Data.Sqlite.dll that ↵Diva Canto2010-04-262-2/+1
| | | | | | | | | | | | | | | | 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.
| * | | * Commenting SQLiteNG out of prebuild.xml, because it's making compile fail ↵Diva Canto2010-04-262-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | 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-232-7/+0
| | | | | | | | | | | | | | | | OpenSim.DataStore.MonoSqlite.dll, since this hasn't exist for a long, long time
| * | | get region prim saving working properly in SQLiteNGJustin Clark-Casey (justincc)2010-04-231-10/+13
| | | | | | | | | | | | | | | | it wasn't working because of debug work that I'd forgotton to take out
| * | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-04-2312-11/+14
| |\ \ \
| | * | | add a comment about deprecating IRegionModuledahlia2010-04-231-0/+3
| | | | |
| | * | | put SQLiteNG classes in their own namespace to avoid confusionJustin Clark-Casey2010-04-2312-12/+12
| | | | |
| * | | | dispose of the DbCommand used to execute migrations after we've finished ↵Justin Clark-Casey (justincc)2010-04-232-2/+3
| |/ / / | | | | | | | | | | | | | | | | | | | | with it rather than within the loop disposing of it within the loop causes Mono.Data.Sqlite.dll to get upset, and it's the wrong behaviour anyway
| * | | minor: correct the assembly information for SQLiteNGJustin Clark-Casey (justincc)2010-04-231-2/+2
| | | |
| * | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-04-239-11/+32
| |\ \ \
| | * \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-04-2241-190/+458
| | |\ \ \
generated by cgit v1.1 at 2024-12-22 10:11:41 +0000