diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2011-01-21 15:55:31 -0800 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2011-01-21 15:55:31 -0800 |
| commit | 1e9111466bb8a77fc8054ca3d458a6692579fd3e (patch) | |
| tree | 16b3642ca58b29e5037aa9563fba84179df9ceb5 /indra/newview/llagent.cpp | |
| parent | dd3607cba651439fb1f73e78df38a160a2ef4f5c (diff) | |
| parent | 45e25e83cf7457f495b051b9f7683ee299547290 (diff) | |
Merge
Diffstat (limited to 'indra/newview/llagent.cpp')
| -rw-r--r-- | indra/newview/llagent.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 77552663ab..7d908df5ce 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -64,6 +64,7 @@ #include "lltool.h" #include "lltoolmgr.h" #include "lltrans.h" +#include "llurlentry.h" #include "llviewercontrol.h" #include "llviewerdisplay.h" #include "llviewerjoystick.h" @@ -649,6 +650,10 @@ void LLAgent::setRegion(LLViewerRegion *regionp) } mRegionp = regionp; + // Pass the region host to LLUrlEntryParcel to resolve parcel name + // with a server request. + LLUrlEntryParcel::setRegionHost(getRegionHost()); + // Must shift hole-covering water object locations because local // coordinate frame changed. LLWorld::getInstance()->updateWaterObjects(); |