aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Data
diff options
context:
space:
mode:
authorMelanie2010-10-18 20:30:46 +0100
committerMelanie2010-10-18 20:30:46 +0100
commitbb7a755cba628a24bb339ed0aa974ac0ee5503d1 (patch)
treeb1c7fd32711dd46b7080643c6a6900f3fe827cce /OpenSim/Data
parentMerge branch 'master' into careminster-presence-refactor (diff)
parentAlphabetize results on region search by prefix matching (diff)
downloadopensim-SC_OLD-bb7a755cba628a24bb339ed0aa974ac0ee5503d1.zip
opensim-SC_OLD-bb7a755cba628a24bb339ed0aa974ac0ee5503d1.tar.gz
opensim-SC_OLD-bb7a755cba628a24bb339ed0aa974ac0ee5503d1.tar.bz2
opensim-SC_OLD-bb7a755cba628a24bb339ed0aa974ac0ee5503d1.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to 'OpenSim/Data')
-rw-r--r--OpenSim/Data/MySQL/MySQLRegionData.cs2
1 files changed, 2 insertions, 0 deletions
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index baa948e..efefad9 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -62,6 +62,8 @@ namespace OpenSim.Data.MySQL
62 if (scopeID != UUID.Zero) 62 if (scopeID != UUID.Zero)
63 command += " and ScopeID = ?scopeID"; 63 command += " and ScopeID = ?scopeID";
64 64
65 command += " order by regionName";
66
65 using (MySqlCommand cmd = new MySqlCommand(command)) 67 using (MySqlCommand cmd = new MySqlCommand(command))
66 { 68 {
67 cmd.Parameters.AddWithValue("?regionName", regionName); 69 cmd.Parameters.AddWithValue("?regionName", regionName);