aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles
diff options
context:
space:
mode:
authorMelanie Thielker2017-01-05 19:07:37 +0000
committerMelanie Thielker2017-01-05 19:07:37 +0000
commitb16abc8166c29585cb76cc55c3bdd76e5833cb4f (patch)
tree6a34f465a74b7a3a6dc00a3d7aa8dcc25ac3e3a5 /OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles
parentMake it possible to disable the bakes module in the way it is described in co... (diff)
downloadopensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.zip
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.gz
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.bz2
opensim-SC-b16abc8166c29585cb76cc55c3bdd76e5833cb4f.tar.xz
Massive tab and trailing space cleanup
Diffstat (limited to 'OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles')
-rw-r--r--OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs28
1 files changed, 14 insertions, 14 deletions
diff --git a/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
index 4701ee6..9e75ee2 100644
--- a/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
+++ b/OpenSim/Region/CoreModules/ServiceConnectorsIn/UserProfiles/LocalUserProfilesServiceConnector.cs
@@ -77,8 +77,8 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
77 { 77 {
78 get; private set; 78 get; private set;
79 } 79 }
80 80
81 public Type ReplaceableInterface 81 public Type ReplaceableInterface
82 { 82 {
83 get { return null; } 83 get { return null; }
84 } 84 }
@@ -87,7 +87,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
87 { 87 {
88 m_log.Debug("[LOCAL USERPROFILES SERVICE CONNECTOR]: LocalUserProfileServicesConnector no params"); 88 m_log.Debug("[LOCAL USERPROFILES SERVICE CONNECTOR]: LocalUserProfileServicesConnector no params");
89 } 89 }
90 90
91 public LocalUserProfilesServicesConnector(IConfigSource source) 91 public LocalUserProfilesServicesConnector(IConfigSource source)
92 { 92 {
93 m_log.Debug("[LOCAL USERPROFILES SERVICE CONNECTOR]: LocalUserProfileServicesConnector instantiated directly."); 93 m_log.Debug("[LOCAL USERPROFILES SERVICE CONNECTOR]: LocalUserProfileServicesConnector instantiated directly.");
@@ -97,7 +97,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
97 public void InitialiseService(IConfigSource source) 97 public void InitialiseService(IConfigSource source)
98 { 98 {
99 ConfigName = "UserProfilesService"; 99 ConfigName = "UserProfilesService";
100 100
101 // Instantiate the request handler 101 // Instantiate the request handler
102 IHttpServer Server = MainServer.Instance; 102 IHttpServer Server = MainServer.Instance;
103 103
@@ -107,35 +107,35 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
107 m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: UserProfilesService missing from OpenSim.ini"); 107 m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: UserProfilesService missing from OpenSim.ini");
108 return; 108 return;
109 } 109 }
110 110
111 if(!config.GetBoolean("Enabled",false)) 111 if(!config.GetBoolean("Enabled",false))
112 { 112 {
113 Enabled = false; 113 Enabled = false;
114 return; 114 return;
115 } 115 }
116 116
117 Enabled = true; 117 Enabled = true;
118 118
119 string serviceDll = config.GetString("LocalServiceModule", 119 string serviceDll = config.GetString("LocalServiceModule",
120 String.Empty); 120 String.Empty);
121 121
122 if (serviceDll == String.Empty) 122 if (serviceDll == String.Empty)
123 { 123 {
124 m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: No LocalServiceModule named in section UserProfilesService"); 124 m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: No LocalServiceModule named in section UserProfilesService");
125 return; 125 return;
126 } 126 }
127 127
128 Object[] args = new Object[] { source, ConfigName }; 128 Object[] args = new Object[] { source, ConfigName };
129 ServiceModule = 129 ServiceModule =
130 ServerUtils.LoadPlugin<IUserProfilesService>(serviceDll, 130 ServerUtils.LoadPlugin<IUserProfilesService>(serviceDll,
131 args); 131 args);
132 132
133 if (ServiceModule == null) 133 if (ServiceModule == null)
134 { 134 {
135 m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: Can't load user profiles service"); 135 m_log.Error("[LOCAL USERPROFILES SERVICE CONNECTOR]: Can't load user profiles service");
136 return; 136 return;
137 } 137 }
138 138
139 Enabled = true; 139 Enabled = true;
140 140
141 JsonRpcProfileHandlers handler = new JsonRpcProfileHandlers(ServiceModule); 141 JsonRpcProfileHandlers handler = new JsonRpcProfileHandlers(ServiceModule);
@@ -196,7 +196,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
196 { 196 {
197 if (!Enabled) 197 if (!Enabled)
198 return; 198 return;
199 199
200 lock (regions) 200 lock (regions)
201 { 201 {
202 if (regions.ContainsKey(scene.RegionInfo.RegionID)) 202 if (regions.ContainsKey(scene.RegionInfo.RegionID))
@@ -209,7 +209,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
209 void IRegionModuleBase.RemoveRegion(Scene scene) 209 void IRegionModuleBase.RemoveRegion(Scene scene)
210 { 210 {
211 if (!Enabled) 211 if (!Enabled)
212 return; 212 return;
213 213
214 lock (regions) 214 lock (regions)
215 { 215 {
@@ -221,7 +221,7 @@ namespace OpenSim.Region.CoreModules.ServiceConnectorsOut.Profile
221 void IRegionModuleBase.RegionLoaded(Scene scene) 221 void IRegionModuleBase.RegionLoaded(Scene scene)
222 { 222 {
223 if (!Enabled) 223 if (!Enabled)
224 return; 224 return;
225 } 225 }
226 #endregion 226 #endregion
227 } 227 }