diff options
Diffstat (limited to '')
-rw-r--r-- | OpenSim/Data/MySQL/MySQLUserData.cs | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserData.cs b/OpenSim/Data/MySQL/MySQLUserData.cs index a1c989b..677d287 100644 --- a/OpenSim/Data/MySQL/MySQLUserData.cs +++ b/OpenSim/Data/MySQL/MySQLUserData.cs | |||
@@ -75,7 +75,7 @@ namespace OpenSim.Data.MySQL | |||
75 | string settingPassword = iniFile.ParseFileReadValue("password"); | 75 | string settingPassword = iniFile.ParseFileReadValue("password"); |
76 | string settingPooling = iniFile.ParseFileReadValue("pooling"); | 76 | string settingPooling = iniFile.ParseFileReadValue("pooling"); |
77 | string settingPort = iniFile.ParseFileReadValue("port"); | 77 | string settingPort = iniFile.ParseFileReadValue("port"); |
78 | 78 | ||
79 | m_usersTableName = iniFile.ParseFileReadValue("userstablename"); | 79 | m_usersTableName = iniFile.ParseFileReadValue("userstablename"); |
80 | if (m_usersTableName == null) | 80 | if (m_usersTableName == null) |
81 | { | 81 | { |
@@ -87,7 +87,7 @@ namespace OpenSim.Data.MySQL | |||
87 | { | 87 | { |
88 | m_userFriendsTableName = "userfriends"; | 88 | m_userFriendsTableName = "userfriends"; |
89 | } | 89 | } |
90 | 90 | ||
91 | m_agentsTableName = iniFile.ParseFileReadValue("agentstablename"); | 91 | m_agentsTableName = iniFile.ParseFileReadValue("agentstablename"); |
92 | if (m_agentsTableName == null) | 92 | if (m_agentsTableName == null) |
93 | { | 93 | { |
@@ -96,7 +96,7 @@ namespace OpenSim.Data.MySQL | |||
96 | 96 | ||
97 | m_connectString = "Server=" + settingHostname + ";Port=" + settingPort + ";Database=" + settingDatabase + ";User ID=" + | 97 | m_connectString = "Server=" + settingHostname + ";Port=" + settingPort + ";Database=" + settingDatabase + ";User ID=" + |
98 | settingUsername + ";Password=" + settingPassword + ";Pooling=" + settingPooling + ";"; | 98 | settingUsername + ";Password=" + settingPassword + ";Pooling=" + settingPooling + ";"; |
99 | 99 | ||
100 | database = new MySQLManager(m_connectString); | 100 | database = new MySQLManager(m_connectString); |
101 | } else { | 101 | } else { |
102 | m_connectString = connect; | 102 | m_connectString = connect; |
@@ -105,14 +105,14 @@ namespace OpenSim.Data.MySQL | |||
105 | m_userFriendsTableName = "userfriends"; | 105 | m_userFriendsTableName = "userfriends"; |
106 | database = new MySQLManager(m_connectString); | 106 | database = new MySQLManager(m_connectString); |
107 | } | 107 | } |
108 | 108 | ||
109 | string mapperTypeStr = "MySQL"; | 109 | string mapperTypeStr = "MySQL"; |
110 | DataMapperFactory.MAPPER_TYPE mapperType = | 110 | DataMapperFactory.MAPPER_TYPE mapperType = |
111 | (DataMapperFactory.MAPPER_TYPE) | 111 | (DataMapperFactory.MAPPER_TYPE) |
112 | Enum.Parse(typeof (DataMapperFactory.MAPPER_TYPE), mapperTypeStr); | 112 | Enum.Parse(typeof (DataMapperFactory.MAPPER_TYPE), mapperTypeStr); |
113 | 113 | ||
114 | m_databaseMapper = DataMapperFactory.GetDataBaseMapper(mapperType, m_connectString); | 114 | m_databaseMapper = DataMapperFactory.GetDataBaseMapper(mapperType, m_connectString); |
115 | 115 | ||
116 | m_appearanceMapper = new AppearanceTableMapper(m_databaseMapper, "AvatarAppearance"); | 116 | m_appearanceMapper = new AppearanceTableMapper(m_databaseMapper, "AvatarAppearance"); |
117 | 117 | ||
118 | TestTables(); | 118 | TestTables(); |
@@ -655,7 +655,7 @@ namespace OpenSim.Data.MySQL | |||
655 | 655 | ||
656 | /// Appearance | 656 | /// Appearance |
657 | /// TODO: stubs for now to get us to a compiling state gently | 657 | /// TODO: stubs for now to get us to a compiling state gently |
658 | // override | 658 | // override |
659 | public AvatarAppearance GetUserAppearance(LLUUID user) | 659 | public AvatarAppearance GetUserAppearance(LLUUID user) |
660 | { | 660 | { |
661 | AvatarAppearance appearance = null; | 661 | AvatarAppearance appearance = null; |
@@ -668,7 +668,7 @@ namespace OpenSim.Data.MySQL | |||
668 | return appearance; | 668 | return appearance; |
669 | } | 669 | } |
670 | 670 | ||
671 | // override | 671 | // override |
672 | public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) | 672 | public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) |
673 | { | 673 | { |
674 | m_appearanceMapper.Update(user.UUID, appearance); | 674 | m_appearanceMapper.Update(user.UUID, appearance); |