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/Services/PresenceService | |
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/Services/PresenceService')
3 files changed, 9 insertions, 9 deletions
diff --git a/OpenSim/Services/PresenceService/PresenceService.cs b/OpenSim/Services/PresenceService/PresenceService.cs index 0fe0200..ae92919 100644 --- a/OpenSim/Services/PresenceService/PresenceService.cs +++ b/OpenSim/Services/PresenceService/PresenceService.cs | |||
@@ -71,7 +71,7 @@ namespace OpenSim.Services.PresenceService | |||
71 | data.SessionID = sessionID; | 71 | data.SessionID = sessionID; |
72 | data.Data = new Dictionary<string, string>(); | 72 | data.Data = new Dictionary<string, string>(); |
73 | data.Data["SecureSessionID"] = secureSessionID.ToString(); | 73 | data.Data["SecureSessionID"] = secureSessionID.ToString(); |
74 | 74 | ||
75 | m_Database.Store(data); | 75 | m_Database.Store(data); |
76 | 76 | ||
77 | string prevUserStr = ""; | 77 | string prevUserStr = ""; |
@@ -80,7 +80,7 @@ namespace OpenSim.Services.PresenceService | |||
80 | 80 | ||
81 | m_log.DebugFormat("[PRESENCE SERVICE]: LoginAgent: session {0}, user {1}, region {2}, secure session {3}{4}", | 81 | m_log.DebugFormat("[PRESENCE SERVICE]: LoginAgent: session {0}, user {1}, region {2}, secure session {3}{4}", |
82 | data.SessionID, data.UserID, data.RegionID, secureSessionID, prevUserStr); | 82 | data.SessionID, data.UserID, data.RegionID, secureSessionID, prevUserStr); |
83 | 83 | ||
84 | return true; | 84 | return true; |
85 | } | 85 | } |
86 | 86 | ||
@@ -92,7 +92,7 @@ namespace OpenSim.Services.PresenceService | |||
92 | sessionID, | 92 | sessionID, |
93 | (presence == null) ? null : presence.UserID, | 93 | (presence == null) ? null : presence.UserID, |
94 | (presence == null) ? null : presence.RegionID.ToString()); | 94 | (presence == null) ? null : presence.RegionID.ToString()); |
95 | 95 | ||
96 | return m_Database.Delete("SessionID", sessionID.ToString()); | 96 | return m_Database.Delete("SessionID", sessionID.ToString()); |
97 | } | 97 | } |
98 | 98 | ||
@@ -144,7 +144,7 @@ namespace OpenSim.Services.PresenceService | |||
144 | public PresenceInfo GetAgent(UUID sessionID) | 144 | public PresenceInfo GetAgent(UUID sessionID) |
145 | { | 145 | { |
146 | PresenceInfo ret = new PresenceInfo(); | 146 | PresenceInfo ret = new PresenceInfo(); |
147 | 147 | ||
148 | PresenceData data = m_Database.Get(sessionID); | 148 | PresenceData data = m_Database.Get(sessionID); |
149 | if (data == null) | 149 | if (data == null) |
150 | return null; | 150 | return null; |
diff --git a/OpenSim/Services/PresenceService/PresenceServiceBase.cs b/OpenSim/Services/PresenceService/PresenceServiceBase.cs index a4adb2f..7647865 100644 --- a/OpenSim/Services/PresenceService/PresenceServiceBase.cs +++ b/OpenSim/Services/PresenceService/PresenceServiceBase.cs | |||
@@ -68,7 +68,7 @@ namespace OpenSim.Services.PresenceService | |||
68 | connString = presenceConfig.GetString("ConnectionString", connString); | 68 | connString = presenceConfig.GetString("ConnectionString", connString); |
69 | realm = presenceConfig.GetString("Realm", realm); | 69 | realm = presenceConfig.GetString("Realm", realm); |
70 | } | 70 | } |
71 | 71 | ||
72 | // | 72 | // |
73 | // We tried, but this doesn't exist. We can't proceed. | 73 | // We tried, but this doesn't exist. We can't proceed. |
74 | // | 74 | // |
diff --git a/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs b/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs index af6ec65..a79bc9f 100644 --- a/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/PresenceService/Properties/AssemblyInfo.cs | |||
@@ -2,7 +2,7 @@ | |||
2 | using System.Runtime.CompilerServices; | 2 | using System.Runtime.CompilerServices; |
3 | using System.Runtime.InteropServices; | 3 | using System.Runtime.InteropServices; |
4 | 4 | ||
5 | // General Information about an assembly is controlled through the following | 5 | // General Information about an assembly is controlled through the following |
6 | // set of attributes. Change these attribute values to modify the information | 6 | // set of attributes. Change these attribute values to modify the information |
7 | // associated with an assembly. | 7 | // associated with an assembly. |
8 | [assembly: AssemblyTitle("OpenSim.Services.PresenceService")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.PresenceService")] |
@@ -14,8 +14,8 @@ using System.Runtime.InteropServices; | |||
14 | [assembly: AssemblyTrademark("")] | 14 | [assembly: AssemblyTrademark("")] |
15 | [assembly: AssemblyCulture("")] | 15 | [assembly: AssemblyCulture("")] |
16 | 16 | ||
17 | // Setting ComVisible to false makes the types in this assembly not visible | 17 | // Setting ComVisible to false makes the types in this assembly not visible |
18 | // to COM components. If you need to access a type in this assembly from | 18 | // to COM components. If you need to access a type in this assembly from |
19 | // COM, set the ComVisible attribute to true on that type. | 19 | // COM, set the ComVisible attribute to true on that type. |
20 | [assembly: ComVisible(false)] | 20 | [assembly: ComVisible(false)] |
21 | 21 | ||
@@ -25,7 +25,7 @@ using System.Runtime.InteropServices; | |||
25 | // Version information for an assembly consists of the following four values: | 25 | // Version information for an assembly consists of the following four values: |
26 | // | 26 | // |
27 | // Major Version | 27 | // Major Version |
28 | // Minor Version | 28 | // Minor Version |
29 | // Build Number | 29 | // Build Number |
30 | // Revision | 30 | // Revision |
31 | // | 31 | // |