diff options
| author | Mic Bowman | 2011-08-05 11:13:02 -0700 |
|---|---|---|
| committer | Mic Bowman | 2011-08-05 11:13:02 -0700 |
| commit | c3f579046c4de7a5a65e71e4c02958425fd7998a (patch) | |
| tree | b725d9eaa66d5eb7cf1f87ddbb4fa0f4284f71f5 /OpenSim/Services/LLLoginService | |
| parent | BulletSim: Parameters settable from ini file. Linksets. Physical property val... (diff) | |
| parent | remove the largely unused copy/pasted HandleAgentRequestSit() method (diff) | |
| download | opensim-SC-c3f579046c4de7a5a65e71e4c02958425fd7998a.zip opensim-SC-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.gz opensim-SC-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.bz2 opensim-SC-c3f579046c4de7a5a65e71e4c02958425fd7998a.tar.xz | |
Merge branch 'master' into bulletsim
Diffstat (limited to 'OpenSim/Services/LLLoginService')
| -rw-r--r-- | OpenSim/Services/LLLoginService/LLLoginService.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/OpenSim/Services/LLLoginService/LLLoginService.cs b/OpenSim/Services/LLLoginService/LLLoginService.cs index 2b15896..00405a1 100644 --- a/OpenSim/Services/LLLoginService/LLLoginService.cs +++ b/OpenSim/Services/LLLoginService/LLLoginService.cs | |||
| @@ -785,7 +785,7 @@ namespace OpenSim.Services.LLLoginService | |||
| 785 | if (avatar != null) | 785 | if (avatar != null) |
| 786 | aCircuit.Appearance = new AvatarAppearance(avatar); | 786 | aCircuit.Appearance = new AvatarAppearance(avatar); |
| 787 | else | 787 | else |
| 788 | aCircuit.Appearance = new AvatarAppearance(account.PrincipalID); | 788 | aCircuit.Appearance = new AvatarAppearance(); |
| 789 | 789 | ||
| 790 | //aCircuit.BaseFolder = irrelevant | 790 | //aCircuit.BaseFolder = irrelevant |
| 791 | aCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath(); | 791 | aCircuit.CapsPath = CapsUtil.GetRandomCapsObjectPath(); |