diff options
Diffstat (limited to 'OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs')
-rw-r--r-- | OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | 66 |
1 files changed, 34 insertions, 32 deletions
diff --git a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs index 1bddf25..0956f74 100644 --- a/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs +++ b/OpenSim/Region/Environment/Scenes/SceneObjectGroup.Inventory.cs | |||
@@ -38,6 +38,8 @@ namespace OpenSim.Region.Environment.Scenes | |||
38 | { | 38 | { |
39 | public partial class SceneObjectGroup : EntityBase | 39 | public partial class SceneObjectGroup : EntityBase |
40 | { | 40 | { |
41 | private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); | ||
42 | |||
41 | /// <summary> | 43 | /// <summary> |
42 | /// Start a given script. | 44 | /// Start a given script. |
43 | /// </summary> | 45 | /// </summary> |
@@ -53,10 +55,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
53 | } | 55 | } |
54 | else | 56 | else |
55 | { | 57 | { |
56 | MainLog.Instance.Error( | 58 | m_log.Error(String.Format( |
57 | "PRIMINVENTORY", | 59 | "[PRIMINVENTORY]: " + |
58 | "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}", | 60 | "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}", |
59 | localID, Name, UUID, itemID); | 61 | localID, Name, UUID, itemID)); |
60 | } | 62 | } |
61 | } | 63 | } |
62 | 64 | ||
@@ -74,10 +76,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
74 | // } | 76 | // } |
75 | // else | 77 | // else |
76 | // { | 78 | // { |
77 | // MainLog.Instance.Error( | 79 | // m_log.Error(String.Format( |
78 | // "PRIMINVENTORY", | 80 | // "[PRIMINVENTORY]: " + |
79 | // "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}", | 81 | // "Couldn't find part {0} in object group {1}, {2} to start script with ID {3}", |
80 | // localID, Name, UUID, itemID); | 82 | // localID, Name, UUID, itemID)); |
81 | // } | 83 | // } |
82 | // } | 84 | // } |
83 | 85 | ||
@@ -106,10 +108,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
106 | } | 108 | } |
107 | else | 109 | else |
108 | { | 110 | { |
109 | MainLog.Instance.Error( | 111 | m_log.Error(String.Format( |
110 | "PRIMINVENTORY", | 112 | "[PRIMINVENTORY]: " + |
111 | "Couldn't find part {0} in object group {1}, {2} to stop script with ID {3}", | 113 | "Couldn't find part {0} in object group {1}, {2} to stop script with ID {3}", |
112 | partID, Name, UUID, itemID); | 114 | partID, Name, UUID, itemID)); |
113 | } | 115 | } |
114 | } | 116 | } |
115 | 117 | ||
@@ -127,10 +129,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
127 | } | 129 | } |
128 | else | 130 | else |
129 | { | 131 | { |
130 | MainLog.Instance.Error( | 132 | m_log.Error(String.Format( |
131 | "PRIMINVENTORY", | 133 | "[PRIMINVENTORY]: " + |
132 | "Couldn't find part {0} in object group {1}, {2} to retreive prim inventory", | 134 | "Couldn't find part {0} in object group {1}, {2} to retreive prim inventory", |
133 | localID, Name, UUID); | 135 | localID, Name, UUID)); |
134 | } | 136 | } |
135 | return false; | 137 | return false; |
136 | } | 138 | } |
@@ -144,10 +146,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
144 | } | 146 | } |
145 | else | 147 | else |
146 | { | 148 | { |
147 | MainLog.Instance.Error( | 149 | m_log.Error(String.Format( |
148 | "PRIMINVENTORY", | 150 | "[PRIMINVENTORY]: " + |
149 | "Couldn't find part {0} in object group {1}, {2} to request inventory data", | 151 | "Couldn't find part {0} in object group {1}, {2} to request inventory data", |
150 | localID, Name, UUID); | 152 | localID, Name, UUID)); |
151 | } | 153 | } |
152 | } | 154 | } |
153 | 155 | ||
@@ -183,10 +185,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
183 | } | 185 | } |
184 | else | 186 | else |
185 | { | 187 | { |
186 | MainLog.Instance.Error( | 188 | m_log.Error(String.Format( |
187 | "PRIMINVENTORY", | 189 | "[PRIMINVENTORY]: " + |
188 | "Couldn't find prim local ID {0} in group {1}, {2} to add inventory item ID {3}", | 190 | "Couldn't find prim local ID {0} in group {1}, {2} to add inventory item ID {3}", |
189 | localID, Name, UUID, newItemId); | 191 | localID, Name, UUID, newItemId)); |
190 | } | 192 | } |
191 | 193 | ||
192 | return false; | 194 | return false; |
@@ -207,10 +209,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
207 | } | 209 | } |
208 | else | 210 | else |
209 | { | 211 | { |
210 | MainLog.Instance.Error( | 212 | m_log.Error(String.Format( |
211 | "PRIMINVENTORY", | 213 | "[PRIMINVENTORY]: " + |
212 | "Couldn't find prim local ID {0} in prim {1}, {2} to get inventory item ID {3}", | 214 | "Couldn't find prim local ID {0} in prim {1}, {2} to get inventory item ID {3}", |
213 | primID, part.Name, part.UUID, itemID); | 215 | primID, part.Name, part.UUID, itemID)); |
214 | } | 216 | } |
215 | 217 | ||
216 | return null; | 218 | return null; |
@@ -233,10 +235,10 @@ namespace OpenSim.Region.Environment.Scenes | |||
233 | } | 235 | } |
234 | else | 236 | else |
235 | { | 237 | { |
236 | MainLog.Instance.Error( | 238 | m_log.Error(String.Format( |
237 | "PRIMINVENTORY", | 239 | "[PRIMINVENTORY]: " + |
238 | "Couldn't find prim ID {0} to update item {1}, {2}", | 240 | "Couldn't find prim ID {0} to update item {1}, {2}", |
239 | item.ParentPartID, item.Name, item.ItemID); | 241 | item.ParentPartID, item.Name, item.ItemID)); |
240 | } | 242 | } |
241 | 243 | ||
242 | return false; | 244 | return false; |