aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* *remove conflictsTeravus Ovares (Dan Olivares)2009-08-18103-2055/+3432
|\
| * Fixes mantis #4020 (http://opensimulator.org/mantis/view.php?id=4020)Diva Canto2009-08-181-14/+12
| * Commented 2 tests in ScenePresenceTests, one because things were being done i...Diva Canto2009-08-171-6/+13
| * Added one conditional missing on login, for creating inventory if it doesn't ...Diva Canto2009-08-171-1/+13
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-174-100/+31
| |\
| | * Did I say that i don't like git? Remove some stuff that shouldn't haveMelanie2009-08-174-100/+31
| * | Commented out one IAR test, because it's failing and needs attention from jus...Diva Canto2009-08-171-5/+7
| |/
| * Added some padding to the remote inventory connector so that it tries to oper...Diva Canto2009-08-171-4/+70
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-178-26/+86
| |\
| | * no-op to poke pandaJustin Clark-Casey (justincc)2009-08-171-4/+4
| | * Apply http://opensimulator.org/mantis/view.php?id=4016Justin Clark-Casey (justincc)2009-08-171-0/+13
| | * Apply http://opensimulator.org/mantis/view.php?id=3538Justin Clark-Casey (justincc)2009-08-172-4/+18
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimAdam Frisby2009-08-181-0/+2
| | |\
| | | * * More Test tweaking to get down to the root cause of the test wierdnessTeravus Ovares (Dan Olivares)2009-08-171-0/+2
| | * | Added additional configuration options for MRM Security. See OpenSim.ini.exam...Adam Frisby2009-08-181-8/+22
| | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimAdam Frisby2009-08-1835-362/+1531
| | |\
| | * | * Implementing a bunch of Unimplemented MRM stubs.Adam Frisby2009-08-182-10/+27
| * | | Bumping the interface number down again, because this *may* not be a breaking...Diva Canto2009-08-171-1/+1
| * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-1739-369/+1656
| |\ \ \ | | | |/ | | |/|
| | * | Add System.Xml reference to the console projectMelanie2009-08-175-32/+101
| | * | Add the ability to use -console=rest to the region server. UserMelanie2009-08-173-4/+27
| | * | Limit the scrollback buffer output of the command line client toMelanie2009-08-171-1/+14
| | * | Add the OpenSim.ConsoleClient app.Melanie2009-08-174-12/+395
| | * | Merge branch 'master' of ssh://melanie@opensimulator.org/var/git/opensimMelanie2009-08-177-10/+63
| | |\ \
| | | * | Add copyright headers. Formatting cleanup. Fix a compiler warning.Jeff Ames2009-08-177-10/+63
| | * | | Filling in the blanks: The "meat" of the REST consoleMelanie2009-08-173-14/+390
| | |/ /
| | * | * handle litjson errors for now. We'll remove this when we hear back from ...Teravus Ovares (Dan Olivares)2009-08-161-21/+38
| | * | * Added Expression based ignores to the PropertyScrambler, which makes a lot ...Kunnis2009-08-169-224/+229
| | * | * More improvements to BasicAssetTest.csKunnis2009-08-161-26/+12
| | * | * Fixed MySQL/MySQLAssetData.cs to properly do updates * Removed an extra par...Kunnis2009-08-166-37/+95
| | * | * Modified SQLite/SQLiteInventoryStore.cs to not throw if the inventory row d...Kunnis2009-08-166-64/+154
| | * | Adding in Reflection-based testing, to ensure that all properties are covered.Kunnis2009-08-1611-105/+174
| | * | Add copyright header. Formatting cleanup.Jeff Ames2009-08-173-3/+30
| | * | Fix argument index in log4net call. (fixes #4003)Jeff Ames2009-08-171-1/+1
| | |/
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimAdam Frisby2009-08-175-7/+26
| | |\
| | | * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-08-1632-151/+428
| | | |\
| | | * | * ShortVersion, another attempt at fixing the test thread death that randomly...Teravus Ovares (Dan Olivares)2009-08-164-7/+10
| | | * | * minor: commentsTeravus Ovares (Dan Olivares)2009-08-161-0/+16
| | * | | * Implements AppDomain Security for MRM Scripts.Adam Frisby2009-08-171-2/+101
| | | |/ | | |/|
| * | | Bumped up grid services interface number.Diva Canto2009-08-161-1/+1
| * | | uh. how about *really* removing it, and not just write a comment above, hey d...Diva Canto2009-08-161-1/+1
| * | | Remove the call to ResetAttachments upon login. The info in the DB should alw...Diva Canto2009-08-161-1/+3
| * | | IAvatarFactory.UpdateDatabase gets the assetID and not the object's inworld U...Diva Canto2009-08-162-1/+9
| * | | Removing the conditional for assetID=Zero upon rezzing attachments on login.Diva Canto2009-08-161-5/+7
| * | | Removed some debug messagesDiva Canto2009-08-163-42/+7
| * | | Making attachments work again. Tons of debug more. This needs more testing an...Diva Canto2009-08-168-67/+184
| * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into in...Diva Canto2009-08-1631-141/+369
| |\ \ \ | | |/ /
| | * | * Implements ISecurityCredential member on SPAvatar, SPAvatarAttachmentAdam Frisby2009-08-165-9/+17
| | * | * Refactor: Moves IAvatarAttachment into IAvatarAttachment.cs instead of IAva...Adam Frisby2009-08-162-13/+15
| | * | * Implements ISecurityCredential on all uses of SOPObject.cs except Avatar At...Adam Frisby2009-08-162-2/+2