aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
diff options
context:
space:
mode:
authorMelanie2012-08-14 02:11:13 +0100
committerMelanie2012-08-14 02:11:13 +0100
commit053e7279ca5d9be8f2ae2f79d0a2c74ab056f147 (patch)
tree772fd824cbbe5a6bc594875ac3ee03c00115cef5 /OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs
parentMerge branch 'master' into careminster (diff)
parentImplement the temp attachments. UNTESTED (diff)
downloadopensim-SC-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.zip
opensim-SC-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.tar.gz
opensim-SC-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.tar.bz2
opensim-SC-053e7279ca5d9be8f2ae2f79d0a2c74ab056f147.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/CoreModules/Avatar/Attachments/AttachmentsModule.cs OpenSim/Region/Framework/Interfaces/IAttachmentsModule.cs OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to 'OpenSim/Region/Framework/Scenes/SceneObjectGroup.Inventory.cs')
0 files changed, 0 insertions, 0 deletions