summaryrefslogtreecommitdiff
path: root/indra/newview/llviewerregion.cpp
diff options
context:
space:
mode:
authorJames Cook <james@lindenlab.com>2010-04-16 19:06:17 -0700
committerJames Cook <james@lindenlab.com>2010-04-16 19:06:17 -0700
commit69de1f4eb7cdd063bbdd7b4019a6a9799fc5dc5f (patch)
treeb495b2123016a6119131f12fb2e1fcef3e0e8bcb /indra/newview/llviewerregion.cpp
parent4218819951a5caa1499e79d8bd4f1bf08fe3b3cc (diff)
Accept expires timestamp as UTC datetime in LLSD
Diffstat (limited to 'indra/newview/llviewerregion.cpp')
-rw-r--r--indra/newview/llviewerregion.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/indra/newview/llviewerregion.cpp b/indra/newview/llviewerregion.cpp
index 2b907ee24a..feade68edc 100644
--- a/indra/newview/llviewerregion.cpp
+++ b/indra/newview/llviewerregion.cpp
@@ -176,6 +176,9 @@ public:
}
}
+ // JAMESDEBUG *TODO* THIS IS WRONG!!!!!!!!!!!!!!!!!!!!!
+ // this isn't necessarily the region the viewer is in
+
// Avatar name lookup library needs to know who to ask
std::string name_lookup_url = mRegion->getCapability("GetDisplayNames");
// capabilities require URLs with slashes before query params, like:
@@ -188,6 +191,8 @@ public:
name_lookup_url += '/';
}
LLAvatarNameCache::setNameLookupURL(name_lookup_url);
+
+ llinfos << "JAMESDEBUG cap " << name_lookup_url << llendl;
if (STATE_SEED_GRANTED_WAIT == LLStartUp::getStartupState())
{