diff options
author | onefang | 2019-05-19 21:24:15 +1000 |
---|---|---|
committer | onefang | 2019-05-19 21:24:15 +1000 |
commit | 5e4d6cab00cb29cd088ab7b62ab13aff103b64cb (patch) | |
tree | a9fbc62df9eb2d1d9ba2698d8552eae71eca20d8 /OpenSim/Services/AvatarService | |
parent | Add a build script. (diff) | |
download | opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.zip opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.gz opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.bz2 opensim-SC_OLD-5e4d6cab00cb29cd088ab7b62ab13aff103b64cb.tar.xz |
Dump OpenSim 0.9.0.1 into it's own branch.
Diffstat (limited to 'OpenSim/Services/AvatarService')
-rw-r--r-- | OpenSim/Services/AvatarService/AvatarService.cs | 4 | ||||
-rw-r--r-- | OpenSim/Services/AvatarService/AvatarServiceBase.cs | 2 | ||||
-rw-r--r-- | OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Services/AvatarService/AvatarService.cs b/OpenSim/Services/AvatarService/AvatarService.cs index 423c781..222944c 100644 --- a/OpenSim/Services/AvatarService/AvatarService.cs +++ b/OpenSim/Services/AvatarService/AvatarService.cs | |||
@@ -56,7 +56,7 @@ namespace OpenSim.Services.AvatarService | |||
56 | AvatarData avatar = GetAvatar(principalID); | 56 | AvatarData avatar = GetAvatar(principalID); |
57 | return avatar.ToAvatarAppearance(); | 57 | return avatar.ToAvatarAppearance(); |
58 | } | 58 | } |
59 | 59 | ||
60 | public bool SetAppearance(UUID principalID, AvatarAppearance appearance) | 60 | public bool SetAppearance(UUID principalID, AvatarAppearance appearance) |
61 | { | 61 | { |
62 | AvatarData avatar = new AvatarData(appearance); | 62 | AvatarData avatar = new AvatarData(appearance); |
@@ -136,7 +136,7 @@ namespace OpenSim.Services.AvatarService | |||
136 | { | 136 | { |
137 | av.Data["Value"] = kvp.Value; | 137 | av.Data["Value"] = kvp.Value; |
138 | } | 138 | } |
139 | 139 | ||
140 | if (!m_Database.Store(av)) | 140 | if (!m_Database.Store(av)) |
141 | { | 141 | { |
142 | m_Database.Delete("PrincipalID", principalID.ToString()); | 142 | m_Database.Delete("PrincipalID", principalID.ToString()); |
diff --git a/OpenSim/Services/AvatarService/AvatarServiceBase.cs b/OpenSim/Services/AvatarService/AvatarServiceBase.cs index ab9d7cd..c1c4fb7 100644 --- a/OpenSim/Services/AvatarService/AvatarServiceBase.cs +++ b/OpenSim/Services/AvatarService/AvatarServiceBase.cs | |||
@@ -68,7 +68,7 @@ namespace OpenSim.Services.AvatarService | |||
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/AvatarService/Properties/AssemblyInfo.cs b/OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs index a233d8a..816ab0b 100644 --- a/OpenSim/Services/AvatarService/Properties/AssemblyInfo.cs +++ b/OpenSim/Services/AvatarService/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.AvatarService")] | 8 | [assembly: AssemblyTitle("OpenSim.Services.AvatarService")] |
@@ -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,9 +25,9 @@ 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 | // |
32 | [assembly: AssemblyVersion("0.8.3.*")] | 32 | [assembly: AssemblyVersion(OpenSim.VersionInfo.AssemblyVersionNumber)] |
33 | 33 | ||