aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Adapt CM to the new CHANGED_OWNER handlingMelanie Thielker2010-05-031-0/+3
|
* Merge branch 'master' into careminster-presence-refactorMelanie2010-05-035-947/+351
|\
| * * Untested Suggestion from lkalif to changeTeravus Ovares (Dan Olivares)2010-05-021-1/+1
| | | | | | | | | | | | | | remoteClient.SendMapBlock(blocks, 0); to remoteClient.SendMapBlock(blocks, 2); in OpenSim/Region/CoreModules/World/WorldMap/MapSearchModule.cs
| * Renamed HGInventoryBroker2 to HGInventoryBroker.Diva Canto2010-05-022-3/+2
| |
| * Deleted HGInventoryBroker, so that the new one can take its name.Diva Canto2010-05-021-540/+0
| |
| * Switched everything to XInventory by default. The old Inventory is still ↵Diva Canto2010-05-021-83/+28
| | | | | | | | there for now, in case bugs pop up with XInventory.
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-306-146/+87
|\ \ | |/
| * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2010-04-305-145/+85
| |\
| | * * XInventory fairly tested, including for HG. Almost ready to switch.Diva Canto2010-04-305-145/+85
| | | | | | | | | | | | * Removed a few buglets and added better exception handling.
| * | Fix a null ref from trying to access a dictionary that was never initialized.Melanie2010-04-301-1/+2
| |/
| * Fix some symbol errorsMelanie2010-04-301-2/+2
| |
* | Fix some symbol errorsMelanie2010-04-301-2/+2
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-303-280/+283
|\ \ | |/
| * 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-301-3/+3
| |/
* | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-301-2/+2
|\ \
| * \ Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-301-2/+2
| |\ \
| | * | Fix link security issueMelanie2010-04-301-2/+2
| | | |
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-295-1/+649
|\ \ \ \ | | |_|/ | |/| |
| * | | Started redoing HGInventoryBroker for XInventory and with multi-protocol in ↵Diva Canto2010-04-293-0/+645
| | | | | | | | | | | | | | | | mind. Unfinished.
| * | | Merge branch 'minor-stuff'Melanie2010-04-281-1/+1
| |\ \ \
| | * | | Spelling in FriendsModule.cs: "filed to load" -> "failed to load"unknown2010-04-281-1/+1
| | | | |
| * | | | XInventory connector/handler showing signs of life. Tested, but needs more ↵Diva Canto2010-04-272-0/+3
| |/ / / | | | | | | | | | | | | testing.
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-271-0/+324
|\ \ \ \ | |/ / /
| * | | RemoteXInventoryServiceConnector, the plugin region module. Not active in ↵Diva Canto2010-04-261-0/+324
| | | | | | | | | | | | | | | | default configs yet.
* | | | Use the saved script statesMelanie Thielker2010-04-241-1/+0
| | | |
* | | | Plumb a data path to initialize an attachment from an alternate sourceMelanie Thielker2010-04-242-2/+19
| | | |
* | | | Add an additional serialization call do the detach procedure. This call isMelanie Thielker2010-04-231-0/+3
| | | | | | | | | | | | | | | | | | | | executed only for it's side effects, which are to block until attach(NULL_KEY) completes, before commencing detachment.
* | | | Fix a nullref in attachment handling. Add some debug to find the attachmentMelanie Thielker2010-04-231-1/+2
| | | | | | | | | | | | | | | | state issue
* | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-212-6/+14
|\ \ \ \ | |/ / /
| * | | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2010-04-193-1/+4
| |\ \ \
| | * | | Avoid duplicate script resumes. Move resume calls to more logical placesMelanie Thielker2010-04-192-2/+2
| | | | |
| * | | | Make the "notecard saved" text appear in the saver rather than the notecard ↵Justin Clark-Casey (justincc)2010-04-191-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owner, if the notecard is saved by a permitted group member This means moving the alert up to a place where the IClientAPI is available. One can also argue that such client messages shouldn't be sent directly from the scene data model
| * | | | If a transfer request is received for a task inventory item asset, then ↵Justin Clark-Casey (justincc)2010-04-191-6/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | route the permissions request through the existing CanEditScript() and CanEditNotecard() methods. This implements the 'share with group' flag for notecards and scripts in prim inventory since the PermissionsModule checks group membership and permissions. Other than that, the code in PermissionsModule duplicates the checks in LLClientView so there should be no change other than allowing group members to edit embedded notecards and scripts. For all other asset types, the permission checking code in LLClientView continues to be used, pending refactoring of suitable permissions code This means that 'share with group' will not yet work for prim inventory items other than notecards and scripts
* | | | | Avoid duplicate script resumes. Move resume calls to more logical placesMelanie Thielker2010-04-192-2/+2
| | | | |
* | | | | Remove the event trigger for the attach event from the attachment module.Melanie Thielker2010-04-191-1/+1
| | | | | | | | | | | | | | | | | | | | The script engine already triggers this internally.
* | | | | Merge branch 'master' into careminster-presence-refactorMelanie2010-04-198-53/+129
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | All scripts are now created suspended and are only unsuspended when the objectMelanie2010-04-193-1/+4
| |/ / / | | | | | | | | | | | | | | | | | | | | is fully rezzed and all scripts in it are instantiated. This ensures that link messages will not be lost on rez/region crossing and makes heavily scripted objects reliable.
| * | | refactor: move DeatchObject() into the AttachmentsModuleJustin Clark-Casey (justincc)2010-04-171-0/+10
| | | |
| * | | refactor: crudely move DetachSingleAttachmentToGround() over to the ↵Justin Clark-Casey (justincc)2010-04-161-0/+32
| | | | | | | | | | | | | | | | AttachmentsModule
| * | | minor: correctly print out missing item id when it can't be found rather ↵Justin Clark-Casey (justincc)2010-04-161-1/+4
| | | | | | | | | | | | | | | | than a NullReferenceException
| * | | refactor: crudely move the RezMultipleAttachments() method into the ↵Justin Clark-Casey (justincc)2010-04-161-0/+12
| | | | | | | | | | | | | | | | AttachmentsModule
| * | | minor: use the static ascii and utf8 encodings instead of instantiating our ownJustin Clark-Casey (justincc)2010-04-161-6/+3
| | | |
| * | | Add --skip-assets option to load oar.Justin Clark-Casey (justincc)2010-04-163-24/+37
| | | | | | | | | | | | | | | | | | | | This allows you to load an oar without loading its assets. This is useful if you know that the required assets are already in the asset service, since loading without assets is quicker. This option will become more useful when the ability to save oars without assets is added, which should happen fairly soon. At this point there will also be better documentation.
| * | | * Adds IAssetService.GetCached() to allow asset fetching from the local ↵John Hurliman2010-04-084-0/+241
| | | | | | | | | | | | | | | | | | | | | | | | | | | | cache only * Adds GetTextureModule that implements the "GetTexture" capability, aka HTTP texture fetching. This is a significantly optimized path that does not require any server-side JPEG2000 decoding, texture priority queue, or UDP file transfer * Sanity check for null reference in LLClientView.RefreshGroupMembership()
| * | | check group membership and powers with the groups module rather than just ↵Justin Clark-Casey (justincc)2010-04-051-12/+27
| | | | | | | | | | | | | | | | | | | | | | | | the client's active group id this resolves the earlier issue where notecards/scripts shared with group could only be edited if the user had that group active
* | | | Merge branch 'careminster' into careminster-presence-refactorMelanie2010-04-134-0/+250
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch '0.6.9-post-fixes' into careminsterMelanie2010-04-134-0/+250
| |\ \ \ | | | |/ | | |/|
| | * | Changed the GetTextureModule backport to work with the 0.6.9 codebaseJohn Hurliman2010-04-081-2/+11
| | | |