aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region (follow)
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | | | | | | gone in.
* | Commented out one IAR test, because it's failing and needs attention from ↵Diva Canto2009-08-171-5/+7
|/ | | | justincc or arthursv. I think the mock inventory service needs a little bit more beef.
* 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
| | | | | | | | | | | | Add ability to silence IRC relay of region joins and quits from certain users This is useful for admins who wish to remain hidden, or service bots. Thanks RemedyTomm
| * Added additional configuration options for MRM Security. See ↵Adam Frisby2009-08-181-8/+22
| | | | | | | | OpenSim.ini.example under the [MRM] section.
| * 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
| | | | | | | | | | | | and pass are specified the same way as for the ROBUST server
| * | 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 ↵Teravus Ovares (Dan Olivares)2009-08-163-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | randomly occurs. * LongVersion nIni may be causing the test thread death. Pausing OpenSimulator during startup causes a nIni error that makes debugging startup operations difficult for users. It might be because when it's in pause mode, something else reads from the nini config passed? If it is, it might not be fixable.. however, if it's concurrency that causes nini death it would make sense to give each section of the tests a new IConfigSource so that they don't read from the same configsource at the same time.
| | * | * minor: commentsTeravus Ovares (Dan Olivares)2009-08-161-0/+16
| | | |
| * | | * Implements AppDomain Security for MRM Scripts.Adam Frisby2009-08-171-2/+101
| | |/ | |/| | | | | | | * Added permissionLevel attribute to [MRM] section in OpenSim.ini. Default is 'Internet', however may be any of the following (case sensitive), FullTrust, SkipVerification, Execution, Nothing, LocalIntranet, Internet, Everything. For previous functionality, set to FullTrust or Execution.
* | | IAvatarFactory.UpdateDatabase gets the assetID and not the object's inworld ↵Diva Canto2009-08-161-1/+3
| | | | | | | | | | | | UUID.
* | | 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 ↵Diva Canto2009-08-166-66/+120
| | | | | | | | | | | | and a lot of cleaning.
* | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim into ↵Diva Canto2009-08-1622-135/+303
|\ \ \ | |/ / | | | | | | inventory-connector
| * | * Implements ISecurityCredential member on SPAvatar, SPAvatarAttachmentAdam Frisby2009-08-165-9/+17
| | | | | | | | | | | | * Disables 'event not used' warning for IRCClientView; cuts OpenSim total warnings back.
| * | * Refactor: Moves IAvatarAttachment into IAvatarAttachment.cs instead of ↵Adam Frisby2009-08-162-13/+15
| | | | | | | | | | | | IAvatar.cs
| * | * Implements ISecurityCredential on all uses of SOPObject.cs except Avatar ↵Adam Frisby2009-08-162-2/+2
| | | | | | | | | | | | Attachments.
| * | * [MRM] Added permission checks to MRM Events (ie, requires edit permission ↵Adam Frisby2009-08-161-6/+9
| | | | | | | | | | | | to bind to OnTouch)
| * | * 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
| | | | | | | | | | | | | | | | Handler - ref mantis #4010
| * | | * [MRM] Implements permission checks on IObject implementations in ↵Adam Frisby2009-08-163-9/+92
| |/ / | | | | | | | | | SOPObject.cs. Does not implement security on IObjectInventory yet.
* | | 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 ↵Diva Canto2009-08-141-0/+8
| | | | | | | | | | | | | | | | GetSession. This doesn't fix the underlying problem of these things being null -- they shouldn't be.
| * | | Changed the way to get to the profile service. Changed GetSystemsFolder in ↵Diva Canto2009-08-142-5/+19
| | | | | | | | | | | | | | | | HGBroker.
| * | | 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 ↵Diva Canto2009-08-142-2/+12
| | | | | | | | | | | | | | | | RemoteInventoryServiceConnector.cs, where the scene reference wasn't being set.
| * | | Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensimDiva Canto2009-08-131-2/+2
| |\ \ \
| * | | | Added GetAssetPermissions. Few last bugs nixed. This is ready for testing.Diva Canto2009-08-136-28/+49
| | | | |
| * | | | Renamed QueryItem/QueryFolder to GetItem/GetFolder. The word 'query' ↵Diva Canto2009-08-1313-49/+49
| | | | | | | | | | | | | | | | | | | | starting to get on my nerves.
| * | | | Inventory redirects from CachedUserInfo to InventoryService COMPLETE!Diva Canto2009-08-1310-390/+146
| | | | |