Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

llpreviewgesture.cpp changes snuck past me in an early commit.

Browse Source
This commit is contained in:
Shyotl
2012-12-06 17:19:10 -06:00
parent e750c598be
commit f80394fc02
1 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
indra/newview/llpreviewgesture.cpp
View File

@@ -123,7 +123,7 @@ LLPreviewGesture* LLPreviewGesture::show(const std::string& title, const LLUUID&
LLPreviewGesture* preview = (LLPreviewGesture*)LLPreview::find(item_id); LLPreviewGesture* preview = (LLPreviewGesture*)LLPreview::find(item_id);
if (preview) if (preview)
{ {
previewp->open(); /*Flawfinder: ignore*/ preview->open(); /*Flawfinder: ignore*/
} }
else else
{ {
@@ -140,7 +140,7 @@ LLPreviewGesture* LLPreviewGesture::show(const std::string& title, const LLUUID&
LLMultiFloater* hostp = preview->getHost(); LLMultiFloater* hostp = preview->getHost();
if (hostp == NULL) if (hostp == NULL)
{ {
LLRect r = self->getRect(); LLRect r = preview->getRect();
LLRect screen = gFloaterView->getRect(); LLRect screen = gFloaterView->getRect();
r.setLeftTopAndSize(0, screen.getHeight(), r.getWidth(), r.getHeight()); r.setLeftTopAndSize(0, screen.getHeight(), r.getWidth(), r.getHeight());
preview->setRect(r); preview->setRect(r);
@@ -928,13 +928,13 @@ void LLPreviewGesture::onLoadComplete(LLVFS *vfs,
LLVFile file(vfs, asset_uuid, type, LLVFile::READ); LLVFile file(vfs, asset_uuid, type, LLVFile::READ);
S32 size = file.getSize(); S32 size = file.getSize();
char* buffer = new char[size+1]; std::vector<char> buffer(size+1);
file.read((U8*)buffer, size); /*Flawfinder: ignore*/ file.read((U8*)&buffer[0], size);
buffer[size] = '\0'; buffer[size] = '\0';
LLMultiGesture* gesture = new LLMultiGesture(); LLMultiGesture* gesture = new LLMultiGesture();
LLDataPackerAsciiBuffer dp(buffer, size+1); LLDataPackerAsciiBuffer dp(&buffer[0], size+1);
BOOL ok = gesture->deserialize(dp); BOOL ok = gesture->deserialize(dp);
if (ok) if (ok)
@@ -956,9 +956,6 @@ void LLPreviewGesture::onLoadComplete(LLVFS *vfs,
delete gesture; delete gesture;
gesture = NULL; gesture = NULL;
delete [] buffer;
buffer = NULL;
self->mAssetStatus = PREVIEW_ASSET_LOADED; self->mAssetStatus = PREVIEW_ASSET_LOADED;
} }
else else
@@ -1526,7 +1523,7 @@ void LLPreviewGesture::onCommitWait()
if (!step_item) return; if (!step_item) return;
LLGestureStep* step = (LLGestureStep*)step_item->getUserdata(); LLGestureStep* step = (LLGestureStep*)step_item->getUserdata();
if (getType() != STEP_WAIT) return; if (step->getType() != STEP_WAIT) return;
LLGestureStepWait* wait_step = (LLGestureStepWait*)step; LLGestureStepWait* wait_step = (LLGestureStepWait*)step;
U32 flags = 0x0; U32 flags = 0x0;