aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-2916-150/+875
|\ \ \ \ | | |_|/ | |/| |
| * | | Started redoing HGInventoryBroker for XInventory and with multi-protocol in m...Diva Canto2010-04-294-3/+648
| * | | Merge branch 'minor-stuff'Melanie2010-04-287-67/+74
| |\ \ \
| | * | | Refactoring in Migration.cs: "using()" instead of explicit Dispose()AlexRa2010-04-281-52/+56
| | * | | 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
| | * | | 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
| | * | | 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 m_Data...John Hurliman2010-04-271-1/+4
| * | | | * Thanks cmickeyb, for a patch that corrects an invalid construction of Primi...John Hurliman2010-04-271-1/+1
| * | | | XInventory connector/handler showing signs of life. Tested, but needs more te...Diva Canto2010-04-275-69/+139
| |/ / /
* | | | 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
| * | | Adding LinkUp/LinkDown when a region is started or stoped.sacha2010-04-232-3/+7
| * | | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-192-17/+48
| |\ \ \ | | | |/ | | |/|
| | * | Fix http://opensimulator.org/mantis/view.php?id=4657 where OpenSim.Grid.UserS...Justin Clark-Casey (justincc)2010-04-162-17/+48
* | | | 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 def...Diva Canto2010-04-263-1/+400
| * | | | 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 i...Diva Canto2010-04-261-2/+2
| * | | minor: eliminate configuration section handling deprecation of OpenSim.DataSt...Justin Clark-Casey (justincc)2010-04-231-6/+0
| * | | get region prim saving working properly in SQLiteNGJustin Clark-Casey (justincc)2010-04-231-10/+13
| * | | 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 with...Justin Clark-Casey (justincc)2010-04-232-2/+3
| |/ / /
| * | | 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-235-10/+31
| |\ \ \
| | * \ \ Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJohn Hurliman2010-04-2236-188/+455
| | |\ \ \