diff options
| author | Merov Linden <merov@lindenlab.com> | 2011-01-12 11:12:56 -0800 |
|---|---|---|
| committer | Merov Linden <merov@lindenlab.com> | 2011-01-12 11:12:56 -0800 |
| commit | c6895302edde86c48218cd0eb6c2e6b60799845f (patch) | |
| tree | 3c5f5e915d9a932537b5a0f7d327521344db2725 /indra/newview/llagent.cpp | |
| parent | 3fa22188387d656f0a3c29c474604b309e64da6d (diff) | |
| parent | 376ee7a3f9a07f584386e45516645ce3acbe3cb6 (diff) | |
STORM-797 : pull in viewer-development
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(); |