diff options
| author | Diva Canto | 2014-04-24 14:12:04 -0700 |
|---|---|---|
| committer | Diva Canto | 2014-04-24 14:12:04 -0700 |
| commit | cf54df3ecf7c83817d7f5c654b622a14291ac9ae (patch) | |
| tree | f155b54fa2f08acc540b9a754b10991d77671d36 /OpenSim/Data | |
| parent | Fixes a long-standing bug related to god-mode change ownership of objects per... (diff) | |
| parent | Revert "When linking a Hypergrid region, set the region's flags on the in-mem... (diff) | |
| download | opensim-SC_OLD-cf54df3ecf7c83817d7f5c654b622a14291ac9ae.zip opensim-SC_OLD-cf54df3ecf7c83817d7f5c654b622a14291ac9ae.tar.gz opensim-SC_OLD-cf54df3ecf7c83817d7f5c654b622a14291ac9ae.tar.bz2 opensim-SC_OLD-cf54df3ecf7c83817d7f5c654b622a14291ac9ae.tar.xz | |
Merge branch 'master' of ssh://opensimulator.org/var/git/opensim
Diffstat (limited to 'OpenSim/Data')
| -rw-r--r-- | OpenSim/Data/MySQL/MySQLUserProfilesData.cs | 5 | ||||
| -rw-r--r-- | OpenSim/Data/SQLite/SQLiteUserProfilesData.cs | 6 |
2 files changed, 0 insertions, 11 deletions
diff --git a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs index cc4c5b0..e301bbe 100644 --- a/OpenSim/Data/MySQL/MySQLUserProfilesData.cs +++ b/OpenSim/Data/MySQL/MySQLUserProfilesData.cs | |||
| @@ -634,8 +634,6 @@ namespace OpenSim.Data.MySQL | |||
| 634 | { | 634 | { |
| 635 | if(reader.HasRows) | 635 | if(reader.HasRows) |
| 636 | { | 636 | { |
| 637 | m_log.DebugFormat("[PROFILES_DATA]" + | ||
| 638 | ": Getting data for {0}.", props.UserId); | ||
| 639 | reader.Read(); | 637 | reader.Read(); |
| 640 | props.WebUrl = (string)reader["profileURL"]; | 638 | props.WebUrl = (string)reader["profileURL"]; |
| 641 | UUID.TryParse((string)reader["profileImage"], out props.ImageId); | 639 | UUID.TryParse((string)reader["profileImage"], out props.ImageId); |
| @@ -651,9 +649,6 @@ namespace OpenSim.Data.MySQL | |||
| 651 | } | 649 | } |
| 652 | else | 650 | else |
| 653 | { | 651 | { |
| 654 | m_log.DebugFormat("[PROFILES_DATA]" + | ||
| 655 | ": No data for {0}", props.UserId); | ||
| 656 | |||
| 657 | props.WebUrl = string.Empty; | 652 | props.WebUrl = string.Empty; |
| 658 | props.ImageId = UUID.Zero; | 653 | props.ImageId = UUID.Zero; |
| 659 | props.AboutText = string.Empty; | 654 | props.AboutText = string.Empty; |
diff --git a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs index 0f5b4c8..5494091 100644 --- a/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs +++ b/OpenSim/Data/SQLite/SQLiteUserProfilesData.cs | |||
| @@ -584,9 +584,6 @@ namespace OpenSim.Data.SQLite | |||
| 584 | } | 584 | } |
| 585 | if(reader != null && reader.Read()) | 585 | if(reader != null && reader.Read()) |
| 586 | { | 586 | { |
| 587 | m_log.DebugFormat("[PROFILES_DATA]" + | ||
| 588 | ": Getting data for {0}.", props.UserId); | ||
| 589 | |||
| 590 | props.WebUrl = (string)reader["profileURL"]; | 587 | props.WebUrl = (string)reader["profileURL"]; |
| 591 | UUID.TryParse((string)reader["profileImage"], out props.ImageId); | 588 | UUID.TryParse((string)reader["profileImage"], out props.ImageId); |
| 592 | props.AboutText = (string)reader["profileAboutText"]; | 589 | props.AboutText = (string)reader["profileAboutText"]; |
| @@ -601,9 +598,6 @@ namespace OpenSim.Data.SQLite | |||
| 601 | } | 598 | } |
| 602 | else | 599 | else |
| 603 | { | 600 | { |
| 604 | m_log.DebugFormat("[PROFILES_DATA]" + | ||
| 605 | ": No data for {0}", props.UserId); | ||
| 606 | |||
| 607 | props.WebUrl = string.Empty; | 601 | props.WebUrl = string.Empty; |
| 608 | props.ImageId = UUID.Zero; | 602 | props.ImageId = UUID.Zero; |
| 609 | props.AboutText = string.Empty; | 603 | props.AboutText = string.Empty; |