diff options
Merge branch 'master' into careminster
Conflicts:
OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/Plugins/Timer.cs
OpenSim/Region/ScriptEngine/XEngine/XEngine.cs
Diffstat (limited to 'OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs')
| -rw-r--r-- | OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs index b06788b..83347e2 100644 --- a/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs +++ b/OpenSim/Region/ClientStack/Linden/Caps/BunchOfCaps/BunchOfCaps.cs | |||
| @@ -105,7 +105,6 @@ namespace OpenSim.Region.ClientStack.Linden | |||
| 105 | private static readonly string m_ResourceCostSelectedPath = "0103/"; | 105 | private static readonly string m_ResourceCostSelectedPath = "0103/"; |
| 106 | private static readonly string m_UpdateAgentInformationPath = "0500/"; | 106 | private static readonly string m_UpdateAgentInformationPath = "0500/"; |
| 107 | 107 | ||
| 108 | |||
| 109 | // These are callbacks which will be setup by the scene so that we can update scene data when we | 108 | // These are callbacks which will be setup by the scene so that we can update scene data when we |
| 110 | // receive capability calls | 109 | // receive capability calls |
| 111 | public NewInventoryItem AddNewInventoryItem = null; | 110 | public NewInventoryItem AddNewInventoryItem = null; |