aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Expand)AuthorAgeFilesLines
* *remove conflictsTeravus Ovares (Dan Olivares)2009-08-1855-1601/+1590
|\
| * 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
| * 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
| |/
| * Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-176-26/+71
| |\
| | * no-op to poke pandaJustin Clark-Casey (justincc)2009-08-171-4/+4
| | * Apply http://opensimulator.org/mantis/view.php?id=3538Justin Clark-Casey (justincc)2009-08-172-4/+18
| | * 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-1812-40/+158
| | |\
| | * | * Implementing a bunch of Unimplemented MRM stubs.Adam Frisby2009-08-182-10/+27
| * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-1715-42/+277
| |\ \ \ | | | |/ | | |/|
| | * | 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-172-3/+26
| | * | Add copyright headers. Formatting cleanup. Fix a compiler warning.Jeff Ames2009-08-171-1/+0
| | * | 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-174-2/+20
| | |\
| | | * Merge branch 'master' of ssh://MyConnection/var/git/opensimTeravus Ovares (Dan Olivares)2009-08-1623-145/+362
| | | |\
| | | * | * ShortVersion, another attempt at fixing the test thread death that randomly...Teravus Ovares (Dan Olivares)2009-08-163-2/+4
| | | * | * minor: commentsTeravus Ovares (Dan Olivares)2009-08-161-0/+16
| | * | | * Implements AppDomain Security for MRM Scripts.Adam Frisby2009-08-171-2/+101
| | | |/ | | |/|
| * | | IAvatarFactory.UpdateDatabase gets the assetID and not the object's inworld U...Diva Canto2009-08-161-1/+3
| * | | 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-166-66/+120
| * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into in...Diva Canto2009-08-1622-135/+303
| |\ \ \ | | |/ /
| | * | * 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
| | * | * [MRM] Added permission checks to MRM Events (ie, requires edit permission t...Adam Frisby2009-08-161-6/+9
| | * | * Fixes potential NulRef in MRM Security Checks.Adam Frisby2009-08-162-3/+4
| | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimAdam Frisby2009-08-1615-94/+165
| | |\ \
| | | * | Add copyright headers. Formatting cleanup.Jeff Ames2009-08-162-1/+55
| | | * | Misc cleanup.Jeff Ames2009-08-167-93/+58
| | | * | Thanks dmiles for a patch that adds PacketType.RequestMultipleObjects Packet ...Adam Johnson2009-08-166-0/+52
| | * | | * [MRM] Implements permission checks on IObject implementations in SOPObject....Adam Frisby2009-08-163-9/+92
| | |/ /
| * | | Merge branch 'master' into inventory-connectorDiva Canto2009-08-151-1/+1
| |\ \ \
| | * | | Changed one word in a commentDiva Canto2009-08-151-1/+1
| * | | | Merge branch 'master' of ../opensim-diva/ into inventory-connectorMelanie2009-08-1525-1332/+863
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Changed FromAssetID to FromItemIDDiva Canto2009-08-156-25/+25
| | * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-154-28/+334
| | |\ \ | | | |/
| | * | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-146-61/+55
| | |\ \
| | * | | Returning UUID.Zero is scene and user profile service are null in GetSession....Diva Canto2009-08-141-0/+8
| | * | | Changed the way to get to the profile service. Changed GetSystemsFolder in HG...Diva Canto2009-08-142-5/+19
| | * | | More debug messages.Diva Canto2009-08-141-0/+7
| | * | | Doing session lookup in the right way.Diva Canto2009-08-142-8/+11
| | * | | Additional debug messages, and bug fix in RemoteInventoryServiceConnector.cs,...Diva Canto2009-08-142-2/+12
| | * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-131-2/+2
| | |\ \ \