diff options
author | John Hurliman | 2009-09-30 15:28:23 -0700 |
---|---|---|
committer | John Hurliman | 2009-09-30 15:28:23 -0700 |
commit | acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009 (patch) | |
tree | 305349e1bd0a5849fd7f96483e24d5e07b24b8f4 /OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | |
parent | * Adding Scale to EntityBase * Fixing the incorrect initialization of EntityB... (diff) | |
parent | Formatting cleanup. (diff) | |
download | opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.zip opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.gz opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.bz2 opensim-SC-acfe2d9f4e5a55d38b16cac7d0d0a25b64b6b009.tar.xz |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Region/Framework/Interfaces/IEntityInventory.cs')
-rw-r--r-- | OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs index 1ed92fb..2c906a2 100644 --- a/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs +++ b/OpenSim/Region/Framework/Interfaces/IEntityInventory.cs | |||
@@ -64,7 +64,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
64 | /// <summary> | 64 | /// <summary> |
65 | /// Change every item in this inventory to a new group. | 65 | /// Change every item in this inventory to a new group. |
66 | /// </summary> | 66 | /// </summary> |
67 | /// <param name="groupID"></param> | 67 | /// <param name="groupID"></param> |
68 | void ChangeInventoryGroup(UUID groupID); | 68 | void ChangeInventoryGroup(UUID groupID); |
69 | 69 | ||
70 | /// <summary> | 70 | /// <summary> |
@@ -94,7 +94,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
94 | /// <param name="startParam"></param> | 94 | /// <param name="startParam"></param> |
95 | /// <param name="postOnRez"></param> | 95 | /// <param name="postOnRez"></param> |
96 | /// <param name="engine"></param> | 96 | /// <param name="engine"></param> |
97 | /// <param name="stateSource"></param> | 97 | /// <param name="stateSource"></param> |
98 | void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource); | 98 | void CreateScriptInstance(UUID itemId, int startParam, bool postOnRez, string engine, int stateSource); |
99 | 99 | ||
100 | /// <summary> | 100 | /// <summary> |
@@ -150,7 +150,7 @@ namespace OpenSim.Region.Framework.Interfaces | |||
150 | 150 | ||
151 | /// <summary> | 151 | /// <summary> |
152 | /// Return the name with which a client can request a xfer of this prim's inventory metadata | 152 | /// Return the name with which a client can request a xfer of this prim's inventory metadata |
153 | /// </summary> | 153 | /// </summary> |
154 | string GetInventoryFileName(); | 154 | string GetInventoryFileName(); |
155 | 155 | ||
156 | bool GetInventoryFileName(IClientAPI client, uint localID); | 156 | bool GetInventoryFileName(IClientAPI client, uint localID); |