Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-27 | 1 | -0/+324 |
|\ | |||||
| * | RemoteXInventoryServiceConnector, the plugin region module. Not active in ↵ | Diva Canto | 2010-04-26 | 1 | -0/+324 |
| | | | | | | | | default configs yet. | ||||
* | | Use the saved script states | Melanie Thielker | 2010-04-24 | 1 | -1/+0 |
| | | |||||
* | | Plumb a data path to initialize an attachment from an alternate source | Melanie Thielker | 2010-04-24 | 2 | -2/+19 |
| | | |||||
* | | Add an additional serialization call do the detach procedure. This call is | Melanie Thielker | 2010-04-23 | 1 | -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 attachment | Melanie Thielker | 2010-04-23 | 1 | -1/+2 |
| | | | | | | | | state issue | ||||
* | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-21 | 2 | -6/+14 |
|\ \ | |/ | |||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-04-19 | 3 | -1/+4 |
| |\ | |||||
| | * | Avoid duplicate script resumes. Move resume calls to more logical places | Melanie Thielker | 2010-04-19 | 2 | -2/+2 |
| | | | |||||
| * | | Make the "notecard saved" text appear in the saver rather than the notecard ↵ | Justin Clark-Casey (justincc) | 2010-04-19 | 1 | -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-19 | 1 | -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 places | Melanie Thielker | 2010-04-19 | 2 | -2/+2 |
| | | | |||||
* | | | Remove the event trigger for the attach event from the attachment module. | Melanie Thielker | 2010-04-19 | 1 | -1/+1 |
| | | | | | | | | | | | | The script engine already triggers this internally. | ||||
* | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-19 | 8 | -53/+129 |
|\ \ \ | | |/ | |/| | |||||
| * | | All scripts are now created suspended and are only unsuspended when the object | Melanie | 2010-04-19 | 3 | -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 AttachmentsModule | Justin Clark-Casey (justincc) | 2010-04-17 | 1 | -0/+10 |
| | | |||||
| * | refactor: crudely move DetachSingleAttachmentToGround() over to the ↵ | Justin Clark-Casey (justincc) | 2010-04-16 | 1 | -0/+32 |
| | | | | | | | | AttachmentsModule | ||||
| * | minor: correctly print out missing item id when it can't be found rather ↵ | Justin Clark-Casey (justincc) | 2010-04-16 | 1 | -1/+4 |
| | | | | | | | | than a NullReferenceException | ||||
| * | refactor: crudely move the RezMultipleAttachments() method into the ↵ | Justin Clark-Casey (justincc) | 2010-04-16 | 1 | -0/+12 |
| | | | | | | | | AttachmentsModule | ||||
| * | minor: use the static ascii and utf8 encodings instead of instantiating our own | Justin Clark-Casey (justincc) | 2010-04-16 | 1 | -6/+3 |
| | | |||||
| * | Add --skip-assets option to load oar. | Justin Clark-Casey (justincc) | 2010-04-16 | 3 | -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 Hurliman | 2010-04-08 | 4 | -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-05 | 1 | -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-refactor | Melanie | 2010-04-13 | 4 | -0/+250 |
|\ \ | |||||
| * \ | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-04-13 | 4 | -0/+250 |
| |\ \ | |||||
| | * | | Changed the GetTextureModule backport to work with the 0.6.9 codebase | John Hurliman | 2010-04-08 | 1 | -2/+11 |
| | | | | |||||
| | * | | Backported GetTextureModule and IAssetService.GetCached() | John Hurliman | 2010-04-08 | 4 | -0/+241 |
| | | | | |||||
* | | | | Merge branch 'careminster' into careminster-presence-refactor | Melanie | 2010-04-05 | 1 | -1/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fixed Ban and parcel exclusion. Need to fix the parcel chat too | lcc | 2010-04-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Change land overlay to send group owned status properly | Melanie Thielker | 2010-03-23 | 1 | -0/+4 |
| | | | | |||||
| * | | | Unify a previous refactor of object return with the older solution. We | Melanie | 2010-03-18 | 2 | -66/+7 |
| | | | | | | | | | | | | | | | | really don't need two methods doing the same thing, but differently. | ||||
| * | | | Merge branch '0.6.9-post-fixes' into careminster | Melanie | 2010-03-06 | 12 | -34/+167 |
| |\ \ \ | | |/ / | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-04-05 | 3 | -8/+50 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Last commit was too fast... must override. | Diva Canto | 2010-04-03 | 1 | -1/+1 |
| | | | | |||||
| * | | | * Fail storing user accounts in the remote connector. | Diva Canto | 2010-04-03 | 1 | -0/+6 |
| | | | | |||||
| * | | | First attempt at fixing mantis #4641. It's better but there are now some ↵ | Diva Canto | 2010-03-31 | 1 | -4/+21 |
| | | | | | | | | | | | | | | | | | | | | | | | | issues with permissions. (looks like my commit is going to touch CM files, I'm going to let it do it - eof only) | ||||
| * | | | Add missing licenses. Change relicensed LightShare module to proper BSD | Melanie | 2010-03-31 | 1 | -4/+23 |
| | | | | | | | | | | | | | | | | licensing. | ||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-31 | 1 | -0/+274 |
|\ \ \ \ | |/ / / | | | | | | | | | Remerge the LightShare bits that were pushed to core | ||||
| * | | | Adding the LightShare module and scripting API. This code was written by | Melanie | 2010-03-31 | 1 | -0/+274 |
| | | | | | | | | | | | | | | | | TomMeta and was contributed by Meta7. | ||||
* | | | | Rename Meta7Windlight to LightShare | Melanie | 2010-03-30 | 2 | -279/+5 |
| | | | | |||||
* | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-30 | 18 | -167/+118 |
|\ \ \ \ | |/ / / | |||||
| * | | | May fix mantis #4613 | Diva Canto | 2010-03-27 | 1 | -1/+2 |
| | | | | |||||
| * | | | minor: Print out port that http servers are using | Justin Clark-Casey (justincc) | 2010-03-25 | 1 | -6/+6 |
| | | | | | | | | | | | | | | | | do this in callers so that we know who is setting up these things | ||||
| * | | | Fix a nullref in permissions when returning objects via right-click | Melanie | 2010-03-20 | 1 | -2/+2 |
| | | | | |||||
| * | | | Merge branch 'master' of ssh://opensimulator.org/var/git/opensim | John Hurliman | 2010-03-19 | 2 | -66/+98 |
| |\ \ \ | |||||
| * | | | | Renamed TryGetAvatar to TryGetScenePresence on SceneManager, SceneBase, ↵ | Dan Lake | 2010-03-19 | 9 | -14/+14 |
| | | | | | | | | | | | | | | | | | | | | Scene and SceneGraph. This was the only change in this patch to keep it isolated from other recent changes to the same set of files. | ||||
| * | | | | Cleaned up access to scenepresences in scenegraph. GetScenePresences and ↵ | Dan Lake | 2010-03-19 | 7 | -144/+94 |
| | | | | | | | | | | | | | | | | | | | | GetAvatars have been removed to consolidate locking and iteration within SceneGraph. All callers which used these to then iterate over presences have been refactored to instead pass their delegates to Scene.ForEachScenePresence(Action<ScenePresence>). | ||||
* | | | | | Merge branch 'master' into careminster-presence-refactor | Melanie | 2010-03-18 | 13 | -103/+193 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Flesh out the new permission method | Melanie | 2010-03-18 | 1 | -4/+95 |
| | | | | | |||||
| * | | | | Unify a previous refactor of object return with the older solution. We | Melanie | 2010-03-18 | 2 | -66/+7 |
| |/ / / | | | | | | | | | | | | | really don't need two methods doing the same thing, but differently. |