diff options
author | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
---|---|---|
committer | Melanie Thielker | 2017-01-05 19:07:37 +0000 |
commit | b16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch) | |
tree | 6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs | |
parent | Make it possible to disable the bakes module in the way it is described in co... (diff) | |
download | opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2 opensim-SC_OLD-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz |
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs')
-rw-r--r-- | OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs index 0c632b1..d652f43 100644 --- a/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs +++ b/OpenSim/Region/CoreModules/Framework/DynamicAttributes/DAExampleModule.cs | |||
@@ -53,12 +53,12 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule | |||
53 | 53 | ||
54 | protected Scene m_scene; | 54 | protected Scene m_scene; |
55 | protected IDialogModule m_dialogMod; | 55 | protected IDialogModule m_dialogMod; |
56 | 56 | ||
57 | public string Name { get { return "DAExample Module"; } } | 57 | public string Name { get { return "DAExample Module"; } } |
58 | public Type ReplaceableInterface { get { return null; } } | 58 | public Type ReplaceableInterface { get { return null; } } |
59 | 59 | ||
60 | public void Initialise(IConfigSource source) {} | 60 | public void Initialise(IConfigSource source) {} |
61 | 61 | ||
62 | public void AddRegion(Scene scene) | 62 | public void AddRegion(Scene scene) |
63 | { | 63 | { |
64 | if (ENABLED) | 64 | if (ENABLED) |
@@ -70,22 +70,22 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule | |||
70 | m_log.DebugFormat("[DA EXAMPLE MODULE]: Added region {0}", m_scene.Name); | 70 | m_log.DebugFormat("[DA EXAMPLE MODULE]: Added region {0}", m_scene.Name); |
71 | } | 71 | } |
72 | } | 72 | } |
73 | 73 | ||
74 | public void RemoveRegion(Scene scene) | 74 | public void RemoveRegion(Scene scene) |
75 | { | 75 | { |
76 | if (ENABLED) | 76 | if (ENABLED) |
77 | { | 77 | { |
78 | m_scene.EventManager.OnSceneGroupMove -= OnSceneGroupMove; | 78 | m_scene.EventManager.OnSceneGroupMove -= OnSceneGroupMove; |
79 | } | 79 | } |
80 | } | 80 | } |
81 | 81 | ||
82 | public void RegionLoaded(Scene scene) {} | 82 | public void RegionLoaded(Scene scene) {} |
83 | 83 | ||
84 | public void Close() | 84 | public void Close() |
85 | { | 85 | { |
86 | RemoveRegion(m_scene); | 86 | RemoveRegion(m_scene); |
87 | } | 87 | } |
88 | 88 | ||
89 | protected bool OnSceneGroupMove(UUID groupId, Vector3 delta) | 89 | protected bool OnSceneGroupMove(UUID groupId, Vector3 delta) |
90 | { | 90 | { |
91 | OSDMap attrs = null; | 91 | OSDMap attrs = null; |
@@ -96,28 +96,28 @@ namespace OpenSim.Region.CoreModules.Framework.DynamicAttributes.DAExampleModule | |||
96 | 96 | ||
97 | if (!sop.DynAttrs.TryGetStore(Namespace, StoreName, out attrs)) | 97 | if (!sop.DynAttrs.TryGetStore(Namespace, StoreName, out attrs)) |
98 | attrs = new OSDMap(); | 98 | attrs = new OSDMap(); |
99 | 99 | ||
100 | OSDInteger newValue; | 100 | OSDInteger newValue; |
101 | 101 | ||
102 | // We have to lock on the entire dynamic attributes map to avoid race conditions with serialization code. | 102 | // We have to lock on the entire dynamic attributes map to avoid race conditions with serialization code. |
103 | lock (sop.DynAttrs) | 103 | lock (sop.DynAttrs) |
104 | { | 104 | { |
105 | if (!attrs.ContainsKey("moves")) | 105 | if (!attrs.ContainsKey("moves")) |
106 | newValue = new OSDInteger(1); | 106 | newValue = new OSDInteger(1); |
107 | else | 107 | else |
108 | newValue = new OSDInteger(attrs["moves"].AsInteger() + 1); | 108 | newValue = new OSDInteger(attrs["moves"].AsInteger() + 1); |
109 | 109 | ||
110 | attrs["moves"] = newValue; | 110 | attrs["moves"] = newValue; |
111 | 111 | ||
112 | sop.DynAttrs.SetStore(Namespace, StoreName, attrs); | 112 | sop.DynAttrs.SetStore(Namespace, StoreName, attrs); |
113 | } | 113 | } |
114 | 114 | ||
115 | sop.ParentGroup.HasGroupChanged = true; | 115 | sop.ParentGroup.HasGroupChanged = true; |
116 | 116 | ||
117 | string msg = string.Format("{0} {1} moved {2} times", sop.Name, sop.UUID, newValue); | 117 | string msg = string.Format("{0} {1} moved {2} times", sop.Name, sop.UUID, newValue); |
118 | m_log.DebugFormat("[DA EXAMPLE MODULE]: {0}", msg); | 118 | m_log.DebugFormat("[DA EXAMPLE MODULE]: {0}", msg); |
119 | m_dialogMod.SendGeneralAlert(msg); | 119 | m_dialogMod.SendGeneralAlert(msg); |
120 | 120 | ||
121 | return true; | 121 | return true; |
122 | } | 122 | } |
123 | } | 123 | } |