diff options
| author | Seth ProductEngine <slitovchuk@productengine.com> | 2010-12-30 18:18:33 +0200 |
|---|---|---|
| committer | Seth ProductEngine <slitovchuk@productengine.com> | 2010-12-30 18:18:33 +0200 |
| commit | 376ee7a3f9a07f584386e45516645ce3acbe3cb6 (patch) | |
| tree | 49a85948c39a2b145acb1bbf4fda46f7e35c0a85 /indra/newview/llappviewer.cpp | |
| parent | 964e981458234aed37252a7b484f6f6765fff50d (diff) | |
STORM-797 FIXED Added parcel SLURL rendering with human readable parcel names.
- Added parcel info observer to LLUrlEntryParcel.
- Added notifying LLUrlEntryParcel by LLRemoteParcelInfoProcessor when parcel data arrives.
- Added notifying LLUrlEntryParcel about user login, changing host and viewer connection state to use this data in remote parcel requests.
Diffstat (limited to 'indra/newview/llappviewer.cpp')
| -rw-r--r-- | indra/newview/llappviewer.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 3a98c23e05..729f83a2b1 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -93,6 +93,7 @@ #include "llmemory.h" #include "llprimitive.h" #include "llurlaction.h" +#include "llurlentry.h" #include "llvfile.h" #include "llvfsthread.h" #include "llvolumemgr.h" @@ -4567,6 +4568,10 @@ void LLAppViewer::disconnectViewer() cleanup_xfer_manager(); gDisconnected = TRUE; + + // Pass the connection state to LLUrlEntryParcel not to attempt + // parcel info requests while disconnected. + LLUrlEntryParcel::setDisconnected(gDisconnected); } void LLAppViewer::forceErrorLLError() |