1 files changed, 259 insertions, 80 deletions

diff --git a/linden/indra/newview/llviewerobject.cpp b/linden/indra/newview/llviewerobject.cpp
index a989c9d..c560ced 100644
--- a/linden/indra/newview/llviewerobject.cpp
+++ b/linden/indra/newview/llviewerobject.cpp
@@ -96,6 +96,7 @@
 #include "pipeline.h"
 #include "llviewernetwork.h"
 #include "llvowlsky.h"
+#include "llmanip.h"
 
 //#define DEBUG_UPDATE_TYPE
 
@@ -402,13 +403,10 @@ void LLViewerObject::dump() const
                 mNameValuePairs[key]->printNameValue(buffer);
                 llinfos << buffer << llendl;
         }
-
-        S32 i;
-
-        LLViewerObject *child;
-        for (i = 0; i < mChildList.size(); i++)
+        for (child_list_t::iterator iter = mChildList.begin();
+                 iter != mChildList.end(); iter++)
         {
-                child = mChildList[i];
+                LLViewerObject* child = *iter;
                 llinfos << "  child " << child->getID() << llendl;
         }
         */
@@ -467,7 +465,7 @@ void LLViewerObject::setNameValueList(const std::string& name_value_list)
                 if (end > start)
                 {
                         std::string tok = name_value_list.substr(start, end - start);
-                        addNVPair(tok.c_str());
+                        addNVPair(tok);
                 }
                 start = end+1;
         }
@@ -555,20 +553,16 @@ void LLViewerObject::removeChild(LLViewerObject *childp)
         }
 }
 
-LLViewerObject::child_list_t& LLViewerObject::getChildren()
-{
-        return mChildList;
-}
-
 void LLViewerObject::addThisAndAllChildren(LLDynamicArray<LLViewerObject*>& objects)
 {
         objects.put(this);
-        S32 count = mChildList.size();
-        for(S32 i = 0; i < count; i++)
+        for (child_list_t::iterator iter = mChildList.begin();
+                 iter != mChildList.end(); iter++)
         {
-                if (!mChildList[i]->isAvatar())
+                LLViewerObject* child = *iter;
+                if (!child->isAvatar())
                 {
-                        (mChildList[i])->addThisAndAllChildren(objects);
+                        child->addThisAndAllChildren(objects);
                 }
         }
 }
@@ -581,24 +575,25 @@ void LLViewerObject::addThisAndNonJointChildren(LLDynamicArray<LLViewerObject*>&
         {
                 return;
         }
-        S32 count = mChildList.size();
-        for(S32 i = 0; i < count; i++)
+        for (child_list_t::iterator iter = mChildList.begin();
+                 iter != mChildList.end(); iter++)
         {
-                if ( (!mChildList[i]->isAvatar())
-                        && (!mChildList[i]->isJointChild()))
+                LLViewerObject* child = *iter;
+                if ( (!child->isAvatar()) && (!child->isJointChild()))
                 {
-                        (mChildList[i])->addThisAndNonJointChildren(objects);
+                        child->addThisAndNonJointChildren(objects);
                 }
         }
 }
 
 BOOL LLViewerObject::isChild(LLViewerObject *childp) const
 {
-        S32 count = mChildList.size();
-        for(S32 i = 0; i < count; i++)
+        for (child_list_t::const_iterator iter = mChildList.begin();
+                 iter != mChildList.end(); iter++)
         {
-                const LLViewerObject *testChildp = &(*mChildList[i]);
-                if (testChildp == childp) return TRUE;
+                LLViewerObject* testchild = *iter;
+                if (testchild == childp)
+                        return TRUE;
         }
         return FALSE;
 }
@@ -607,11 +602,11 @@ BOOL LLViewerObject::isChild(LLViewerObject *childp) const
 // returns TRUE if at least one avatar is sitting on this object
 BOOL LLViewerObject::isSeat() const
 {
-        S32 count = mChildList.size();
-        for(S32 i = 0; i < count; i++)
+        for (child_list_t::const_iterator iter = mChildList.begin();
+                 iter != mChildList.end(); iter++)
         {
-                const LLViewerObject *childp = &(*mChildList[i]);
-                if (childp->isAvatar())
+                LLViewerObject* child = *iter;
+                if (child->isAvatar())
                 {
                         return TRUE;
                 }
@@ -955,12 +950,9 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                                 S32 nv_size = mesgsys->getSizeFast(_PREHASH_ObjectData, block_num, _PREHASH_NameValue);
                                 if (nv_size > 0)
                                 {
-                                        char* name_value_list = new char[nv_size];
-                                        mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_NameValue, nv_size, name_value_list, block_num);
-
+                                        std::string name_value_list;
+                                        mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_NameValue, name_value_list, block_num);
                                         setNameValueList(name_value_list);
-
-                                        delete [] name_value_list;
                                 }
 
                                 // Clear out any existing generic data
@@ -996,8 +988,8 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                                                 mText->setOnHUDAttachment(isHUDAttachment());
                                         }
 
-                                        char temp_string[256];                  /* Flawfinder: ignore */                // not MAX_STRING, must hold 255 chars + \0
-                                        mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_Text, 256, temp_string, block_num );
+                                        std::string temp_string;
+                                        mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_Text, temp_string, block_num );
                                         
                                         LLColor4U coloru;
                                         mesgsys->getBinaryDataFast(_PREHASH_ObjectData, _PREHASH_TextColor, coloru.mV, 4, block_num);
@@ -1019,13 +1011,13 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                                         mText = NULL;
                                 }
 
-                                char media_url[MAX_STRING+1];           /* Flawfinder: ignore */
-                                mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_MediaURL, MAX_STRING+1, media_url, block_num);
-                                //if (media_url[0])
+                                std::string media_url;
+                                mesgsys->getStringFast(_PREHASH_ObjectData, _PREHASH_MediaURL, media_url, block_num);
+                                //if (!media_url.empty())
                                 //{
                                 //      llinfos << "WEBONPRIM media_url " << media_url << llendl;
                                 //}
-                                if (!mMedia && media_url[0] != '\0')
+                                if (!mMedia && !media_url.empty())
                                 {
                                         retval |= MEDIA_URL_ADDED;
                                         mMedia = new LLViewerObjectMedia;
@@ -1035,7 +1027,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                                 }
                                 else if (mMedia)
                                 {
-                                        if (media_url[0] == '\0')
+                                        if (media_url.empty())
                                         {
                                                 retval |= MEDIA_URL_REMOVED;
                                                 delete mMedia;
@@ -1514,7 +1506,7 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                                         std::string name_value_list;
                                         dp->unpackString(name_value_list, "NV");
 
-                                        setNameValueList(name_value_list.c_str());
+                                        setNameValueList(name_value_list);
                                 }
 
                                 mTotalCRC = crc;
@@ -1847,7 +1839,19 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
                           ||(this_update_precision > mBestUpdatePrecision))))
         {
                 mBestUpdatePrecision = this_update_precision;
-                setPositionParent(new_pos_parent);
+                
+                LLVector3 diff = new_pos_parent - test_pos_parent ;
+                F32 mag_sqr = diff.magVecSquared() ;
+                if(llfinite(mag_sqr)) 
+                {
+                        setPositionParent(new_pos_parent);
+                }
+                else
+                {
+                        llwarns << "Can not move the object/avatar to an infinite location!" << llendl ;        
+
+                        retval |= INVALID_UPDATE ;
+                }
 
                 if (mParent && ((LLViewerObject*)mParent)->isAvatar())
                 {
@@ -1918,11 +1922,11 @@ U32 LLViewerObject::processUpdateMessage(LLMessageSystem *mesgsys,
         // Additionally, if any child is selected, need to update the dialogs and selection
         // center.
         BOOL needs_refresh = mUserSelected;
-        LLViewerObject *childp;
-        for (U32 i = 0; i < mChildList.size(); i++)
+        for (child_list_t::iterator iter = mChildList.begin();
+                 iter != mChildList.end(); iter++)
         {
-                childp = mChildList[i];
-                needs_refresh = needs_refresh || childp->mUserSelected;
+                LLViewerObject* child = *iter;
+                needs_refresh = needs_refresh || child->mUserSelected;
         }
 
         if (needs_refresh)
@@ -2148,7 +2152,7 @@ void LLViewerObject::deleteInventoryItem(const LLUUID& item_id)
 }
 
 void LLViewerObject::doUpdateInventory(
-        LLViewerInventoryItem* item,
+        LLPointer<LLViewerInventoryItem>& item,
         U8 key,
         bool is_new)
 {
@@ -2220,7 +2224,8 @@ void LLViewerObject::doUpdateInventory(
                                 --mInventorySerialNum;
                         }
                 }
-                LLViewerInventoryItem* new_item = new LLViewerInventoryItem(item);
+                LLViewerInventoryItem* oldItem = item;
+                LLViewerInventoryItem* new_item = new LLViewerInventoryItem(oldItem);
                 new_item->setPermissions(perm);
                 mInventory->push_front(new_item);
                 doInventoryCallback();
@@ -2386,7 +2391,7 @@ void LLViewerObject::fetchInventoryFromServer()
 struct LLFilenameAndTask
 {
         LLUUID mTaskID;
-        char mFilename[MAX_STRING];             /* Flawfinder: ignore */                // Just the filename, not the path
+        std::string mFilename;
 #ifdef _DEBUG
         static S32 sCount;
         LLFilenameAndTask()
@@ -2427,8 +2432,8 @@ void LLViewerObject::processTaskInv(LLMessageSystem* msg, void** user_data)
         msg->getS16Fast(_PREHASH_InventoryData, _PREHASH_Serial, object->mInventorySerialNum);
         LLFilenameAndTask* ft = new LLFilenameAndTask;
         ft->mTaskID = task_id;
-        msg->getStringFast(_PREHASH_InventoryData, _PREHASH_Filename, MAX_STRING, ft->mFilename);
-        if(!ft->mFilename[0])
+        msg->getStringFast(_PREHASH_InventoryData, _PREHASH_Filename, ft->mFilename);
+        if(ft->mFilename.empty())
         {
                 lldebugs << "Task has no inventory" << llendl;
                 // mock up some inventory to make a drop target.
@@ -2443,13 +2448,13 @@ void LLViewerObject::processTaskInv(LLMessageSystem* msg, void** user_data)
                 LLPointer<LLInventoryObject> obj;
                 obj = new LLInventoryObject(object->mID, LLUUID::null,
                                                                         LLAssetType::AT_CATEGORY,
-                                                                        "Contents");
+                                                                        std::string("Contents"));
                 object->mInventory->push_front(obj);
                 object->doInventoryCallback();
                 delete ft;
                 return;
         }
-        gXferManager->requestFile(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ft->mFilename).c_str(), 
+        gXferManager->requestFile(gDirUtilp->getExpandedFilename(LL_PATH_CACHE, ft->mFilename), 
                                                                 ft->mFilename, LL_PATH_CACHE,
                                                                 object->mRegionp->getHost(),
                                                                 TRUE,
@@ -2477,12 +2482,12 @@ void LLViewerObject::processTaskInvFile(void** user_data, S32 error_code, LLExtS
         delete ft;
 }
 
-void LLViewerObject::loadTaskInvFile(const char* filename)
+void LLViewerObject::loadTaskInvFile(const std::string& filename)
 {
         LLMemType mt(LLMemType::MTYPE_OBJECT);
         
         std::string filename_and_local_path = gDirUtilp->getExpandedFilename(LL_PATH_CACHE, filename);
-        llifstream ifs(filename_and_local_path.c_str());
+        llifstream ifs(filename_and_local_path);
         if(ifs.good())
         {
                 char buffer[MAX_STRING];        /* Flawfinder: ignore */
@@ -2519,7 +2524,7 @@ void LLViewerObject::loadTaskInvFile(const char* filename)
                         }
                 }
                 ifs.close();
-                LLFile::remove(filename_and_local_path.c_str());
+                LLFile::remove(filename_and_local_path);
         }
         else
         {
@@ -2611,6 +2616,21 @@ void LLViewerObject::updateInventory(
         doUpdateInventory(task_item, key, is_new);
 }
 
+void LLViewerObject::updateInventoryLocal(LLInventoryItem* item, U8 key)
+{
+        LLPointer<LLViewerInventoryItem> task_item =
+                new LLViewerInventoryItem(item->getUUID(), mID, item->getPermissions(),
+                                                                  item->getAssetUUID(), item->getType(),
+                                                                  item->getInventoryType(),
+                                                                  item->getName(), item->getDescription(),
+                                                                  item->getSaleInfo(), item->getFlags(),
+                                                                  item->getCreationDate());
+
+        // do the internal logic
+        const bool is_new = false;
+        doUpdateInventory(task_item, key, is_new);
+}
+
 LLInventoryObject* LLViewerObject::getInventoryObject(const LLUUID& item_id)
 {
         LLInventoryObject* rv = NULL;
@@ -2879,13 +2899,20 @@ void LLViewerObject::boostTexturePriority(BOOL boost_children /* = TRUE */)
                 getTEImage(i)->setBoostLevel(LLViewerImage::BOOST_SELECTED);
         }
 
+        if (isSculpted())
+        {
+                LLSculptParams *sculpt_params = (LLSculptParams *)getParameterEntry(LLNetworkData::PARAMS_SCULPT);
+                LLUUID sculpt_id = sculpt_params->getSculptTexture();
+                gImageList.getImage(sculpt_id)->setBoostLevel(LLViewerImage::BOOST_SELECTED);
+        }
+        
         if (boost_children)
         {
-                S32 num_children = mChildList.size();
-                for (i = 0; i < num_children; i++)
+                for (child_list_t::iterator iter = mChildList.begin();
+                         iter != mChildList.end(); iter++)
                 {
-                        LLViewerObject *childp = mChildList[i];
-                        childp->boostTexturePriority();
+                        LLViewerObject* child = *iter;
+                        child->boostTexturePriority();
                 }
         }
 }
@@ -2970,7 +2997,7 @@ void LLViewerObject::addNVPair(const std::string& data)
         mNameValuePairs[nv->mName] = nv;
 }
 
-BOOL LLViewerObject::removeNVPair(const char *name)
+BOOL LLViewerObject::removeNVPair(const std::string& name)
 {
         char* canonical_name = gNVNameTable.addString(name);
 
@@ -2989,7 +3016,7 @@ BOOL LLViewerObject::removeNVPair(const char *name)
                         gMessageSystem->addUUIDFast(_PREHASH_ID, mID);
                         
                         gMessageSystem->nextBlockFast(_PREHASH_NameValueData);
-                        gMessageSystem->addStringFast(_PREHASH_NVPair, buffer.c_str());
+                        gMessageSystem->addStringFast(_PREHASH_NVPair, buffer);
 
                         gMessageSystem->sendReliable( mRegionp->getHost() );
 */
@@ -3007,7 +3034,7 @@ BOOL LLViewerObject::removeNVPair(const char *name)
 }
 
 
-LLNameValue *LLViewerObject::getNVPair(const char *name) const
+LLNameValue *LLViewerObject::getNVPair(const std::string& name) const
 {
         char            *canonical_name;
 
@@ -3042,7 +3069,7 @@ void LLViewerObject::updatePositionCaches() const
 
 const LLVector3d LLViewerObject::getPositionGlobal() const
 {
-        LLVector3d position_global = mRegionp->getPosGlobalFromRegion(getPositionRegion());;
+        LLVector3d position_global = mRegionp->getPosGlobalFromRegion(getPositionRegion());
 
         if (isAttachment())
         {
@@ -3368,6 +3395,19 @@ LLViewerObject* LLViewerObject::getRootEdit() const
         return (LLViewerObject*)root;
 }
 
+
+BOOL LLViewerObject::lineSegmentIntersect(const LLVector3& start, const LLVector3& end,
+                                                                                  S32 face,
+                                                                                  S32* face_hit,
+                                                                                  LLVector3* intersection,
+                                                                                  LLVector2* tex_coord,
+                                                                                  LLVector3* normal,
+                                                                                  LLVector3* bi_normal)
+{
+        return false;
+}
+
+
 U8 LLViewerObject::getMediaType() const
 {
         if (mMedia)
@@ -3394,7 +3434,7 @@ void LLViewerObject::setMediaType(U8 media_type)
         }
 }
 
-const LLString& LLViewerObject::getMediaURL() const
+std::string LLViewerObject::getMediaURL() const
 {
         if (mMedia)
         {
@@ -3402,11 +3442,11 @@ const LLString& LLViewerObject::getMediaURL() const
         }
         else
         {
-                return LLString::null;
+                return std::string();
         }
 }
 
-void LLViewerObject::setMediaURL(const LLString& media_url)
+void LLViewerObject::setMediaURL(const std::string& media_url)
 {
         LLMemType mt(LLMemType::MTYPE_OBJECT);
         
@@ -3970,9 +4010,11 @@ S32 LLViewerObject::countInventoryContents(LLAssetType::EType type)
 void LLViewerObject::setCanSelect(BOOL canSelect)
 {
         mbCanSelect = canSelect;
-        for (U32 i = 0; i < mChildList.size(); i++)
+        for (child_list_t::iterator iter = mChildList.begin();
+                 iter != mChildList.end(); iter++)
         {
-                mChildList[i]->mbCanSelect = canSelect;
+                LLViewerObject* child = *iter;
+                child->mbCanSelect = canSelect;
         }
 }
 
@@ -4525,9 +4567,11 @@ void LLViewerObject::setDrawableState(U32 state, BOOL recursive)
         }
         if (recursive)
         {
-                for (U32 i = 0; i < mChildList.size(); i++)
+                for (child_list_t::iterator iter = mChildList.begin();
+                         iter != mChildList.end(); iter++)
                 {
-                        mChildList[i]->setDrawableState(state, recursive);
+                        LLViewerObject* child = *iter;
+                        child->setDrawableState(state, recursive);
                 }
         }
 }
@@ -4540,9 +4584,11 @@ void LLViewerObject::clearDrawableState(U32 state, BOOL recursive)
         }
         if (recursive)
         {
-                for (U32 i = 0; i < mChildList.size(); i++)
+                for (child_list_t::iterator iter = mChildList.begin();
+                         iter != mChildList.end(); iter++)
                 {
-                        mChildList[i]->clearDrawableState(state, recursive);
+                        LLViewerObject* child = *iter;
+                        child->clearDrawableState(state, recursive);
                 }
         }
 }
@@ -4777,7 +4823,7 @@ void LLViewerObject::setRegion(LLViewerRegion *regionp)
         mLatestRecvPacketID = 0;
         mRegionp = regionp;
 
-        for (child_list_t::iterator i = getChildren().begin(); i != getChildren().end(); ++i)
+        for (child_list_t::iterator i = mChildList.begin(); i != mChildList.end(); ++i)
         {
                 LLViewerObject* child = *i;
                 child->setRegion(regionp);
@@ -4839,11 +4885,6 @@ BOOL LLViewerObject::setFlags(U32 flags, BOOL state)
         return setit;
 }
 
-BOOL LLViewerObject::lineSegmentIntersect(const LLVector3& start, LLVector3& end) const
-{
-        return FALSE;
-}
-
 void LLViewerObject::applyAngularVelocity(F32 dt)
 {
         //do target omega here
@@ -4916,3 +4957,141 @@ void LLStaticViewerObject::updateDrawable(BOOL force_damped)
         }
         clearChanged(SHIFTED);
 }
+
+void LLViewerObject::saveUnselectedChildrenPosition(std::vector<LLVector3>& positions)
+{
+        if(mChildList.empty() || !positions.empty())
+        {
+                return ;
+        }
+
+        for (LLViewerObject::child_list_t::const_iterator iter = mChildList.begin();
+                        iter != mChildList.end(); iter++)
+        {
+                LLViewerObject* childp = *iter;
+                if (!childp->isSelected() && childp->mDrawable.notNull())
+                {
+                        positions.push_back(childp->getPositionEdit());         
+                }
+        }
+
+        return ;
+}
+
+void LLViewerObject::saveUnselectedChildrenRotation(std::vector<LLQuaternion>& rotations)
+{
+        if(mChildList.empty())
+        {
+                return ;
+        }
+
+        for (LLViewerObject::child_list_t::const_iterator iter = mChildList.begin();
+                        iter != mChildList.end(); iter++)
+        {
+                LLViewerObject* childp = *iter;
+                if (!childp->isSelected() && childp->mDrawable.notNull())
+                {
+                        rotations.push_back(childp->getRotationEdit());                         
+                }               
+        }
+
+        return ;
+}
+
+//counter-rotation
+void LLViewerObject::resetChildrenRotationAndPosition(const std::vector<LLQuaternion>& rotations, 
+                                                                                        const std::vector<LLVector3>& positions)
+{
+        if(mChildList.empty())
+        {
+                return ;
+        }
+
+        S32 index = 0 ;
+        LLQuaternion inv_rotation = ~getRotationEdit() ;
+        LLVector3 offset = getPositionEdit() ;
+        for (LLViewerObject::child_list_t::const_iterator iter = mChildList.begin();
+                        iter != mChildList.end(); iter++)
+        {
+                LLViewerObject* childp = *iter;
+                if (!childp->isSelected() && childp->mDrawable.notNull())
+                {
+                        if (childp->getPCode() != LL_PCODE_LEGACY_AVATAR)
+                        {
+                                childp->setRotation(rotations[index] * inv_rotation);
+                                childp->setPosition((positions[index] - offset) * inv_rotation);
+                                LLManip::rebuild(childp);                                       
+                        }
+                        else //avatar
+                        {
+                                LLVector3 reset_pos = (positions[index] - offset) * inv_rotation ;
+                                LLQuaternion reset_rot = rotations[index] * inv_rotation ;
+
+                                ((LLVOAvatar*)childp)->mDrawable->mXform.setPosition(reset_pos);                                
+                                ((LLVOAvatar*)childp)->mDrawable->mXform.setRotation(reset_rot) ;
+                                
+                                ((LLVOAvatar*)childp)->mDrawable->getVObj()->setPosition(reset_pos, TRUE);                              
+                                ((LLVOAvatar*)childp)->mDrawable->getVObj()->setRotation(reset_rot, TRUE) ;
+
+                                LLManip::rebuild(childp);                               
+                        }       
+                        index++;
+                }                               
+        }
+
+        return ;
+}
+
+//counter-translation
+void LLViewerObject::resetChildrenPosition(const LLVector3& offset, BOOL simplified)
+{
+        if(mChildList.empty())
+        {
+                return ;
+        }
+
+        LLVector3 child_offset;
+        if(simplified) //translation only, rotation matrix does not change
+        {
+                child_offset = offset * ~getRotation();
+        }
+        else //rotation matrix might change too.
+        {
+                if (isAttachment() && mDrawable.notNull())
+                {
+                        LLXform* attachment_point_xform = mDrawable->getXform()->getParent();
+                        LLQuaternion parent_rotation = getRotation() * attachment_point_xform->getWorldRotation();
+                        child_offset = offset * ~parent_rotation;
+                }
+                else
+                {
+                        child_offset = offset * ~getRenderRotation();
+                }
+        }
+
+        for (LLViewerObject::child_list_t::const_iterator iter = mChildList.begin();
+                        iter != mChildList.end(); iter++)
+        {
+                LLViewerObject* childp = *iter;
+                if (!childp->isSelected() && childp->mDrawable.notNull())
+                {
+                        if (childp->getPCode() != LL_PCODE_LEGACY_AVATAR)
+                        {
+                                childp->setPosition(childp->getPosition() + child_offset);
+                                LLManip::rebuild(childp);
+                        }
+                        else //avatar
+                        {
+                                LLVector3 reset_pos = ((LLVOAvatar*)childp)->mDrawable->mXform.getPosition() + child_offset ;
+
+                                ((LLVOAvatar*)childp)->mDrawable->mXform.setPosition(reset_pos);
+                                ((LLVOAvatar*)childp)->mDrawable->getVObj()->setPosition(reset_pos);                            
+                                
+                                LLManip::rebuild(childp);
+                        }                       
+                }               
+        }
+
+        return ;
+}
+