diff options
| author | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-02 10:35:42 -0700 |
|---|---|---|
| committer | Mark Palange (Mani) <palange@lindenlab.com> | 2009-10-02 10:35:42 -0700 |
| commit | 4d53e235c2445b820bb0ae7303b269648dd86037 (patch) | |
| tree | c1ab3643cf257099822e7a0e1e832d76813555f6 /indra/media_plugins/quicktime | |
| parent | 80f27013b2d2a7ca6509db033c8f0c31562e04c7 (diff) | |
| parent | dde2153014cd7d7b8fa704f7067a41344bfbb1c2 (diff) | |
merge of latest viewer/viewer-20
Diffstat (limited to 'indra/media_plugins/quicktime')
| -rw-r--r-- | indra/media_plugins/quicktime/media_plugin_quicktime.cpp | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp index e9be458960..fbda65120d 100644 --- a/indra/media_plugins/quicktime/media_plugin_quicktime.cpp +++ b/indra/media_plugins/quicktime/media_plugin_quicktime.cpp @@ -772,10 +772,7 @@ void MediaPluginQuickTime::receiveMessage(const char *message_string) else if(message_name == "shm_added") { SharedSegmentInfo info; - U64 address_lo = message_in.getValueU32("address"); - U64 address_hi = message_in.hasValue("address_1") ? message_in.getValueU32("address_1") : 0; - info.mAddress = (void*)((address_lo) | - (address_hi * (U64(1)<<31))); + info.mAddress = message_in.getValuePointer("address"); info.mSize = (size_t)message_in.getValueS32("size"); std::string name = message_in.getValue("name"); |