1 files changed, 21 insertions, 18 deletions

diff --git a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
index f768516..bcab2d1 100644
--- a/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
+++ b/OpenSim/ApplicationPlugins/RemoteController/RemoteAdminPlugin.cs
@@ -556,25 +556,28 @@ namespace OpenSim.ApplicationPlugins.RemoteController
                     }
                     else
                     {
-                        // no client supplied UUID: look it up...
-                        CachedUserInfo userInfo 
-                            = m_app.CommunicationsManager.UserProfileCacheService.GetUserDetails(
-                                masterFirst, masterLast);
-                            
-                        if (null == userInfo)
-                        {
-                            m_log.InfoFormat("master avatar does not exist, creating it");
-                            // ...or create new user
-                            userID = m_app.CommunicationsManager.UserAdminService.AddUser(
-                                masterFirst, masterLast, masterPassword, "", region.RegionLocX, region.RegionLocY);
-
-                            if (userID == UUID.Zero)
-                                throw new Exception(String.Format("failed to create new user {0} {1}",
-                                                                  masterFirst, masterLast));
-                        }
-                        else
+                        if (masterFirst != String.Empty && masterLast != String.Empty) // User requests a master avatar
                         {
-                            userID = userInfo.UserProfile.ID;
+                            // no client supplied UUID: look it up...
+                            CachedUserInfo userInfo 
+                                = m_app.CommunicationsManager.UserProfileCacheService.GetUserDetails(
+                                    masterFirst, masterLast);
+                                
+                            if (null == userInfo)
+                            {
+                                m_log.InfoFormat("master avatar does not exist, creating it");
+                                // ...or create new user
+                                userID = m_app.CommunicationsManager.UserAdminService.AddUser(
+                                    masterFirst, masterLast, masterPassword, "", region.RegionLocX, region.RegionLocY);
+
+                                if (userID == UUID.Zero)
+                                    throw new Exception(String.Format("failed to create new user {0} {1}",
+                                                                      masterFirst, masterLast));
+                            }
+                            else
+                            {
+                                userID = userInfo.UserProfile.ID;
+                            }
                         }
                     }