-
- Downloads
svn merge -r 127369:127511...
svn merge -r 127369:127511 svn+ssh://svn.lindenlab.com/svn/linden/branches/avatar-pipeline/landmark-permissions__merge__viewer2.0.0.3-r127280 into svn+ssh://svn.lindenlab.com/svn/linden/branches/viewer/viewer-2.0.0-3 includes post-merge fix for DEV-36563 : Remove mAcceptsCallingCardNames For DEV-36496 : Viewer merge for Landmark & Callingcard Permissions [VIEWER] For DEV-36563 : Remove mAcceptsCallingCardNames Test plans - EXTERNAL * [ Test against a 1.30 server ] * Test various permissions operations - both on items in inventory, and rezzed items and items that are embedded in objects. * Test creating landmarks. Test plans - INTERNAL * Test against any inventory permissions smoke tests. * See test plans in QAR-1644 for full Landmark&Callingcard Permissions test plan.
Showing
- indra/llinventory/llinventory.cpp 13 additions, 0 deletionsindra/llinventory/llinventory.cpp
- indra/llinventory/llparcel.h 3 additions, 1 deletionindra/llinventory/llparcel.h
- indra/llinventory/llpermissions.cpp 11 additions, 0 deletionsindra/llinventory/llpermissions.cpp
- indra/llinventory/llpermissions.h 3 additions, 0 deletionsindra/llinventory/llpermissions.h
- indra/llui/lltexteditor.cpp 0 additions, 1 deletionindra/llui/lltexteditor.cpp
- indra/llui/lltexteditor.h 0 additions, 4 deletionsindra/llui/lltexteditor.h
- indra/newview/app_settings/settings.xml 0 additions, 11 deletionsindra/newview/app_settings/settings.xml
- indra/newview/llfloaterbulkpermission.cpp 0 additions, 2 deletionsindra/newview/llfloaterbulkpermission.cpp
- indra/newview/llfloaterland.cpp 1 addition, 12 deletionsindra/newview/llfloaterland.cpp
- indra/newview/llfloaterland.h 0 additions, 1 deletionindra/newview/llfloaterland.h
- indra/newview/llfloaterproperties.cpp 11 additions, 9 deletionsindra/newview/llfloaterproperties.cpp
- indra/newview/llinventorybridge.cpp 9 additions, 1 deletionindra/newview/llinventorybridge.cpp
- indra/newview/llpanelgroupnotices.cpp 1 addition, 1 deletionindra/newview/llpanelgroupnotices.cpp
- indra/newview/lltooldraganddrop.cpp 3 additions, 9 deletionsindra/newview/lltooldraganddrop.cpp
- indra/newview/llviewertexteditor.cpp 105 additions, 94 deletionsindra/newview/llviewertexteditor.cpp
- indra/newview/llviewertexteditor.h 1 addition, 0 deletionsindra/newview/llviewertexteditor.h
- indra/newview/skins/default/xui/en/floater_about_land.xml 0 additions, 8 deletionsindra/newview/skins/default/xui/en/floater_about_land.xml
- indra/newview/skins/default/xui/en/floater_bulk_perms.xml 5 additions, 23 deletionsindra/newview/skins/default/xui/en/floater_bulk_perms.xml
Loading
Please register or sign in to comment