Merge branch 'master' into careminster-presence-refactor

2010-08-09 02:27:54 +01:00 · 2010-08-09 02:27:54 +01:00 · 1f052520ae
parent bef6fa37b9 144fc20e87
commit 1f052520ae
1 changed files with 6 additions and 2 deletions
--- a/OpenSim/Services/LLLoginService/LLLoginService.cs
+++ b/OpenSim/Services/LLLoginService/LLLoginService.cs
@ -691,7 +691,11 @@ namespace OpenSim.Services.LLLoginService
                        }
                    }
                }
+<<<<<<< HEAD:OpenSim/Services/LLLoginService/LLLoginService.cs
            }
+=======
+            }
+>>>>>>> master:OpenSim/Services/LLLoginService/LLLoginService.cs
            dest = destination;
            if (success)
                return aCircuit;