diff options
| author | Josh Bell <josh@lindenlab.com> | 2008-02-07 17:15:18 +0000 |
|---|---|---|
| committer | Josh Bell <josh@lindenlab.com> | 2008-02-07 17:15:18 +0000 |
| commit | 8bd6a0b3217ea5614d2a29195e528aa8314f6342 (patch) | |
| tree | be5cee5be0678bb03c7174bab9296cfc530d0102 /indra/newview/llviewertexteditor.h | |
| parent | 3314f78a3673c1250e47722848c60d017dafac97 (diff) | |
svn merge -r 79445:79449 svn+ssh://svn.lindenlab.com/svn/linden/qa/maintenance-5-merge-79386
QAR-242 merge of maintenance-5 (QAR-203)
* DEV-6548 Copy To Inventory fail to execute without any output feedback when Notecard has changes but not saved
* DEV-7600 Deleting someone else's object in god mode crashes sim
* DEV-5329 LLSD parsers should determine and set maximum parse sizes
* DEV-7473 Resolve instant message crash report
* DEV-2904 Presence Issues not (apparently) caused by scripted attachments
* DEV-7083 Investigate Null Folder IDs Bug that caused 470K inventory items with Null Folder IDS on the Grid
* DEV-2865 Textures/Snapshots in a notecard are opened again when you click copy to inventory.
* DEV-6612 VWR-3290: Linux scons build script doesn't work with distcc
* DEV-8002 c++ llsd notation parser accepts malformed data
* DEV-8001 c++ xml parse returns wrong number of elements parsed
* DEV-8089 Double delete in statc structured data parse functions
* DEV-5326 Any viewer can request presence information for any agent
* DEV-2378 python service builder does not sort query string
* DEV-7872 Block teleport off teen grid sub-estates like Schome Park / Open University
* DEV-4465 Add a "logfile" command line option to the sim to create log files
Diffstat (limited to 'indra/newview/llviewertexteditor.h')
| -rw-r--r-- | indra/newview/llviewertexteditor.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/indra/newview/llviewertexteditor.h b/indra/newview/llviewertexteditor.h index 1ec173a5d1..02d934fc3c 100644 --- a/indra/newview/llviewertexteditor.h +++ b/indra/newview/llviewertexteditor.h @@ -107,15 +107,16 @@ protected: BOOL getEmbeddedItemToolTipAtPos(S32 pos, LLWString &wmsg); BOOL openEmbeddedItemAtPos( S32 pos ); - BOOL openEmbeddedItem(LLInventoryItem* item, BOOL saved); + BOOL openEmbeddedItem(LLInventoryItem* item); S32 insertEmbeddedItem(S32 pos, LLInventoryItem* item); void openEmbeddedTexture( LLInventoryItem* item ); void openEmbeddedSound( LLInventoryItem* item ); void openEmbeddedLandmark( LLInventoryItem* item ); - void openEmbeddedNotecard( LLInventoryItem* item, BOOL saved ); + void openEmbeddedNotecard( LLInventoryItem* item); void showCopyToInvDialog( LLInventoryItem* item ); + void showUnsavedAlertDialog( LLInventoryItem* item ); static void onCopyToInvDialog( S32 option, void* userdata ); static void onNotecardDialog( S32 option, void* userdata ); |