aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework/TaskInventoryItem.cs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-11-231-1/+1
|\ | | | | | | | | | | | | | | | | Conflicts: .gitignore OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs prebuild.xml runprebuild.bat
| * refactor: replace verbose checks with String.IsNullOrEmpty where applicable.Justin Clark-Casey (justincc)2013-11-151-1/+1
| | | | | | | | Thanks to Kira for this patch from http://opensimulator.org/mantis/view.php?id=6845
* | Merge branch 'master' into careminsterMelanie2012-10-311-11/+8
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * Make "show object part" command correctly display script status.Justin Clark-Casey (justincc)2012-10-311-11/+8
| | | | | | | | | | Uses new IEntityInventory.TryGetScriptInstanceRunning() Makes it clearer that TaskInventoryItem.ScriptRunning cannot be used as it is temporary and not updated.
| * Add preservation of running state of scripts when drag-copying.Melanie2012-07-011-0/+12
| |
* | Merge branch 'master' into careminsterMelanie2012-05-051-3/+13
|\ \ | |/ | | | | | | | | | | | | | | Conflicts: OpenSim/Framework/WebUtil.cs OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs OpenSim/Region/CoreModules/Asset/FlotsamAssetCache.cs OpenSim/Region/CoreModules/Scripting/LSLHttp/UrlModule.cs OpenSim/Region/Framework/Scenes/ScenePresence.cs
| * Fire the scripting changed event with CHANGED_OWNER when an object that has ↵Justin Clark-Casey (justincc)2012-05-051-3/+13
| | | | | | | | | | | | | | changed owners is rezzed. This needs to occur after the script is resumed rather than before, when the event is just dropped. Addresses http://opensimulator.org/mantis/view.php?id=5890 and http://opensimulator.org/mantis/view.php?id=5952
* | Merge branch 'master' into careminsterMelanie2012-02-021-3/+3
|\ \ | |/ | | | | | | | | Conflicts: OpenSim/Framework/TaskInventoryItem.cs OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * Improve reliability of script state saving by covering various savingMelanie2012-02-021-0/+11
| | | | | | | | and loading scenarios which resulted in loss of continuity on item ids
* | Improve reliability of script state saving by covering various savingMelanie2012-02-021-2/+12
| | | | | | | | and loading scenarios which resulted in loss of continuity on item ids
* | Merge branch 'master' into bigmergeMelanie2011-11-281-57/+0
|\ \ | |/ | | | | | | Conflicts: OpenSim/Region/Framework/Scenes/SceneObjectPartInventory.cs
| * Use the more extensive Utils.AssetTypeToString()/InventoryTypeToString() ↵Justin Clark-Casey (justincc)2011-11-251-57/+0
| | | | | | | | conversion rather than the arrays in TaskInventoryItem
* | Preserve the script running flag when copying an object.Melanie2011-01-081-0/+12
| |
* | Merge branch 'master' into careminster-presence-refactorMelanie2010-11-221-0/+56
|\ \ | |/
| * Added creator info across the board -- TaskInventoryItems and InventoryItems ↵Diva Canto2010-11-211-0/+56
| | | | | | | | | | | | themselves. Tested. Seems to be working, main tests pass. Nothing done for IARs or HG transfers yet -- this only works for OARs for the time being. New migration in inventory table in order to make CreatorID varchar(255).
* | Add a setter to OldItemID so it can be deserializedMelanie2010-10-131-0/+3
| |
* | Fix a merge artefact that broke script state persistence in XAttachmentsMelanie2010-09-191-5/+3
|/
* If a scene object part UUID is changed (only possible when not in a scene), ↵Justin Clark-Casey (justincc)2010-09-071-5/+5
| | | | then adjust the inventory items to point to the new uuid as well
* Defer sending of CHANGED_OWNER to make it work on rezzed objects andMelanie2010-05-031-0/+11
| | | | attachments in addition to objects sold in place
* Minor: Change OpenSim to OpenSimulator in older copyright headers and ↵Jeff Ames2009-06-011-1/+1
| | | | LICENSE.txt.
* From: Alan Webb <alan_webb@us.ibm.com>Dr Scofield2009-04-221-0/+11
| | | | | | | | Changes to enable script state persistence across non-restart serialization situations (inventory/OAR/attachments) Also fixing test cases for OAR and IAR so they don't barf with the new code.
* Reverting r9224. We don't have scripts in the SL sense (with binary and state).Homer Horwitz2009-04-191-1/+1
| | | | | | Using this identifier prevents "our" scripts from working. Reopens Mantis #3482, I'm afraid.
* Change invType of scripts from "lsl_text" to "script". Fixes Mantis #3482.Homer Horwitz2009-04-191-1/+1
|
* Committing the LCO database layer. Native MySQL, no ADO. New reconnectMelanie Thielker2008-11-261-0/+1
| | | | | | | | mechanism to prevent prim loss. Preserve link order on sim restart and drag copy. Fix drag-copied prims' inventories. Fix persistence of child prim inventories.
* * Added IClientIM to IClientCore interfacesAdam Frisby2008-11-081-6/+0
| | | | | | * Changed SendInstantMessage, dropped fromAgentSession and imSessionID as security precaution, see http://opensimulator.org/wiki/OpenSim_0.6_IClientAPI#Porting_Guide for details on porting. * Removed unused usings from Framework.*
* Set a default creation date on inventory and task inventory itemsMelanie Thielker2008-10-211-0/+5
|
* one class per file please.Sean Dague2008-10-011-100/+0
| | | | | | This puts the TaskInventoryDictionary in it's own file.
* * This is the fabled LibOMV update with all of the libOMV types from JHurlimanTeravus Ovares2008-09-061-25/+25
| | | | | | | * This is a HUGE OMG update and will definitely have unknown side effects.. so this is really only for the strong hearted at this point. Regular people should let the dust settle. * This has been tested to work with most basic functions. However.. make sure you back up 'everything' before using this. It's that big! * Essentially we're back at square 1 in the testing phase.. so lets identify things that broke.
* Formatting cleanup.Jeff Ames2008-08-181-2/+2
|
* refactor TaskInventoryItem Mask -> Permissions to be consistant with how thingsSean Dague2008-07-231-5/+5
| | | | | | are stored in the db.
* turn fields -> properties in TaskInventoryItemSean Dague2008-07-231-25/+214
|
* dr scofield's warning safari:Dr Scofield2008-06-271-1/+1
| | | | | | | | | | * commented out [Obsolete(....)] attributes where no replacement feature was available: if we want to attribute code that we think needs to be reworked, we should define a new attribute and use that instead (together with a little tool to retrieve all the attributed code then) * commenting out unused variables
* Formatting cleanup, minor refactoring, svn properties.Jeff Ames2008-06-041-2/+2
|
* cleanup: uncommenting null-op else tree in TaskInventoryItem.csDr Scofield2008-06-021-6/+6
|
* * minor: comment out old debugging messages in task inventory item ↵Justin Clarke Casey2008-05-311-5/+5
| | | | restoration routines
* Formatting cleanup.Jeff Ames2008-05-161-6/+6
|
* * Spring cleaning.Adam Frisby2008-04-291-106/+119
| | | | | * Added new generic "Location" class to handle 2D integer locations. Going to use it to replace all RegionHandle and X,Y coordinate references throughout the entire project. You have been warned.
* replace hard tabs with 4 spaces to be consistant in the source.Sean Dague2008-04-241-8/+8
| | | | | | Please adjust your editors to not use hard tabs.
* * Applying Mantis #1021 (llStartAnimation/llStopAnimation) - Thanks Melanie!Adam Frisby2008-04-231-0/+2
|
* * Applying Mantis #1020 (Animations) - Thanks Melanie.Adam Frisby2008-04-231-11/+31
|
* * Optimised using statements and namespace references across entire project ↵Adam Frisby2008-04-211-3/+4
| | | | (this took a while to run).
* * Minor: log message correctionJustin Clarke Casey2008-04-071-1/+1
|
* * Okay you can put down your pitchforks - this patch should fix rezzing of ↵Justin Clarke Casey2008-04-071-27/+17
| | | | | | | | | | | items (with inventory) on Windows * Now properly dealing with prims which don't contain items - thanks to thomas for the patch which gave insight into this situation * Also, an xml exception no longer crahes the client session * Leaving in debugging lines in case there are further problems * Not yet tested on Linux, though I'm just about to.
* * Removing debugging goo for mantis 854 since the fix is reported to work.Justin Clarke Casey2008-04-041-3/+5
|
* * Attempted resolution for mantis 854Justin Clarke Casey2008-04-031-0/+4
| | | | | | * Also adds more temporary debugging goo in case the fix didn't work
* * Add some temporary task inventory item inflation debug messages to ↵Justin Clarke Casey2008-04-021-0/+10
| | | | investigate mantis 854
* Formatting cleanup.Jeff Ames2008-03-181-26/+25
|
* Minor cleanup.Jeff Ames2008-02-201-1/+1
|
* * Fix mantis 345 - it is now possible to duplicate prims directly in the ↵Justin Clarke Casey2008-01-161-15/+46
| | | | | | | | | region again without breakage * This includes their inventories * Also, this revision properly synchronizes prim inventory crud.
* * Store task inventory when an object is taken into agent inventoryJustin Clarke Casey2008-01-161-19/+96
| | | | | | | | * This means that you can take an object from a region and rez it somewhere else, with its inventory intact. * As for earlier, at this stage only scripts can be placed in inventory * This isn't an efficient implementation, a better one will probably need to come along soonish