summaryrefslogtreecommitdiff
path: root/indra/newview/llviewermedia.cpp
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-10-27 15:17:20 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-10-27 15:17:20 -0400
commitfa220db72a2d0b7cef665cdab53c07cdf4eac4cf (patch)
tree3007ca2d839d04ef16692ddbaa59cdd6bf6877af /indra/newview/llviewermedia.cpp
parentfae5abfd0903f09f1485f1f10ebea410ae4f9845 (diff)
parentd2af1ae8b09d76ee50a9a67a0f42fbfd6657d816 (diff)
merge up from viewer-pre-beta
Diffstat (limited to 'indra/newview/llviewermedia.cpp')
-rw-r--r--indra/newview/llviewermedia.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp
index 13dbc5e386..41b4dc01e8 100644
--- a/indra/newview/llviewermedia.cpp
+++ b/indra/newview/llviewermedia.cpp
@@ -1488,7 +1488,8 @@ void LLViewerMedia::setOpenIDCookie()
new LLViewerMediaWebProfileResponder(raw_profile_url.getAuthority()),
headers);
- doOnetimeEarlyHTTPRequests();
+ // FUI: No longer perform the user_status query
+ //doOnetimeEarlyHTTPRequests();
}
}