3 files changed, 1 insertions, 147 deletions

diff --git a/linden/indra/llprimitive/llprimitive.cpp b/linden/indra/llprimitive/llprimitive.cpp
index 7546764..0ad9f79 100755
--- a/linden/indra/llprimitive/llprimitive.cpp
+++ b/linden/indra/llprimitive/llprimitive.cpp
@@ -247,50 +247,22 @@ void LLPrimitive::setTE(const U8 index, const LLTextureEntry& te)
 
 S32  LLPrimitive::setTETexture(const U8 index, const LLUUID &id)
 {
-    // if we're asking for a non-existent face, return null
-        if (te >= mNumTEs)
-        {
-                llwarns << "setting non-existent te " << te << llendl;
-                return 0;
-        }
-
         return mTextureList.setID(index, id);
 }
 
 S32  LLPrimitive::setTEColor(const U8 index, const LLColor4 &color)
 {
-    // if we're asking for a non-existent face, return null
-        if (te >= mNumTEs)
-        {
-                llwarns << "setting non-existent te " << te << llendl;
-                return 0;
-        }
-
 
         return mTextureList.setColor(index, color);
 }
 
 S32  LLPrimitive::setTEColor(const U8 index, const LLColor3 &color)
 {
-    // if we're asking for a non-existent face, return null
-        if (te >= mNumTEs)
-        {
-                llwarns << "setting non-existent te " << te << llendl;
-                return 0;
-        }
-
         return mTextureList.setColor(index, color);
 }
 
 S32  LLPrimitive::setTEAlpha(const U8 index, const F32 alpha)
 {
-    // if we're asking for a non-existent face, return null
-        if (te >= mNumTEs)
-        {
-                llwarns << "setting non-existent te " << te << llendl;
-                return 0;
-        }
-
         return mTextureList.setAlpha(index, alpha);
 }
 
@@ -350,111 +322,46 @@ S32  LLPrimitive::setTERotation(const U8 index, const F32 r)
 //===============================================================
 S32  LLPrimitive::setTEBumpShinyFullbright(const U8 index, const U8 bump)
 {
-    // if we're asking for a non-existent face, return null
-        if (te >= mNumTEs)
-        {
-                llwarns << "setting non-existent te " << te << llendl;
-                return 0;
-        }
-
-        return mTextureList.setBumpShinyFullbright(index, bump);
+        return mTextureList.setBumpShinyFullbright(index, bump);
 }
 
 S32  LLPrimitive::setTEMediaTexGen(const U8 index, const U8 media)
 {
-    // if we're asking for a non-existent face, return null
-        if (te >= mNumTEs)
-        {
-                llwarns << "setting non-existent te " << te << llendl;
-                return 0;
-        }
-
         return mTextureList.setMediaTexGen(index, media);
 }
 
 S32  LLPrimitive::setTEBumpmap(const U8 index, const U8 bump)
 {
-    // if we're asking for a non-existent face, return null
-        if (te >= mNumTEs)
-        {
-                llwarns << "setting non-existent te " << te << llendl;
-                return 0;
-        }
-
         return mTextureList.setBumpMap(index, bump);
 }
 
 S32  LLPrimitive::setTEBumpShiny(const U8 index, const U8 bump_shiny)
 {
-    // if we're asking for a non-existent face, return null
-        if (te >= mNumTEs)
-        {
-                llwarns << "setting non-existent te " << te << llendl;
-                return 0;
-        }
-
         return mTextureList.setBumpShiny(index, bump_shiny);
 }
 
 S32  LLPrimitive::setTETexGen(const U8 index, const U8 texgen)
 {
-    // if we're asking for a non-existent face, return null
-        if (te >= mNumTEs)
-        {
-                llwarns << "setting non-existent te " << te << llendl;
-                return 0;
-        }
-
         return mTextureList.setTexGen(index, texgen);
 }
 
 S32  LLPrimitive::setTEShiny(const U8 index, const U8 shiny)
 {
-    // if we're asking for a non-existent face, return null
-        if (te >= mNumTEs)
-        {
-                llwarns << "setting non-existent te " << te << llendl;
-                return 0;
-        }
-
-
         return mTextureList.setShiny(index, shiny);
 }
 
 S32  LLPrimitive::setTEFullbright(const U8 index, const U8 fullbright)
 {
-
-    // if we're asking for a non-existent face, return null
-        if (te >= mNumTEs)
-        {
-                llwarns << "setting non-existent te " << te << llendl;
-                return 0;
-        }
-
         return mTextureList.setFullbright(index, fullbright);
 }
 
 S32  LLPrimitive::setTEMediaFlags(const U8 index, const U8 media_flags)
 {
-    // if we're asking for a non-existent face, return null
-        if (te >= mNumTEs)
-        {
-                llwarns << "setting non-existent te " << te << llendl;
-                return 0;
-        }
-
         return mTextureList.setMediaFlags(index, media_flags);
 }
 
 S32 LLPrimitive::setTEGlow(const U8 index, const F32 glow)
 {
-        // if we're asking for a non-existent face, return null
-        if (te >= mNumTEs)
-        {
-                llwarns << "setting non-existent te " << te << llendl;
-                        return 0;
-        }
-
         return mTextureList.setGlow(index, glow);
 }
 
@@ -1029,7 +936,6 @@ BOOL LLPrimitive::setVolume(const LLVolumeParams &volume_params, const S32 detai
                         setTE(te_num, *(old_tes.getTexture(face_mapping[face_bit])));
                 }
         }
->>>>>>> 5faaca1... port llprimitive from SG2.0
         return TRUE;
 }
 
diff --git a/linden/indra/newview/CMakeLists.txt b/linden/indra/newview/CMakeLists.txt
index b576ccd..75ba977 100644
--- a/linden/indra/newview/CMakeLists.txt
+++ b/linden/indra/newview/CMakeLists.txt
@@ -1174,7 +1174,6 @@ set(viewer_APPSETTINGS_FILES
     ${CMAKE_SOURCE_DIR}/../scripts/messages/message_template.msg
     )
 
-
 source_group("App Settings" FILES ${viewer_APPSETTINGS_FILES})
 
 set_source_files_properties(${viewer_APPSETTINGS_FILES}
diff --git a/linden/indra/newview/llpanellandmedia.cpp b/linden/indra/newview/llpanellandmedia.cpp
index fc84bb5..db68c42 100644
--- a/linden/indra/newview/llpanellandmedia.cpp
+++ b/linden/indra/newview/llpanellandmedia.cpp
@@ -172,57 +172,6 @@ void LLPanelLandMedia::refresh()
                 BOOL can_change_media = LLViewerParcelMgr::isParcelModifiableByAgent(parcel, GP_LAND_CHANGE_MEDIA);
 
                 mCheckSoundLocal->set( parcel->getSoundLocal() );
-                mCheckSoundLocal->setEnabled( can_change_media );
-
-                LLViewerRegion* region = LLViewerParcelMgr::getInstance()->getSelectionRegion();
-                if (!region)
-                {
-                        // never seen this happen, but log it
-                        llwarns << "Couldn't get selected region." << llendl;
-                }
-
-                // We need to do this differently for OpenSim because it doesn't include
-                // REGION_FLAGS_ALLOW_VOICE in the "RegionInfo" message as of 0.6.9 PF -- MC
-                bool allow_voice = parcel->getParcelFlagAllowVoice();
-                if (gHippoGridManager->getConnectedGrid()->isSecondLife())
-                {
-                        if (region && region->isVoiceEnabled()) // estate-wide voice-disable overrides all
-                        {
-                                mCheckEnableVoiceChatIsEstateDisabled->setVisible(false);
-
-                                mCheckEnableVoiceChat->setVisible(true);
-                                mCheckEnableVoiceChat->setEnabled( can_change_media );
-                                mCheckEnableVoiceChat->set(allow_voice);
-
-                                mCheckEnableVoiceChatParcel->setEnabled( can_change_media && allow_voice );
-                        }
-                        else // disabled at region level
-                        {
-                                mCheckEnableVoiceChatIsEstateDisabled->setVisible(true); // always disabled
-                                mCheckEnableVoiceChat->setVisible(false);
-                                mCheckEnableVoiceChat->setEnabled(false);
-                                mCheckEnableVoiceChat->set(false);
-
-                                mCheckEnableVoiceChatParcel->setEnabled(false);
-                        }
-                }
-                else
-                {
-                        mCheckEnableVoiceChatIsEstateDisabled->setVisible(true);
-
-                        mCheckEnableVoiceChat->setVisible(true);
-                        mCheckEnableVoiceChat->setEnabled( can_change_media );
-                        mCheckEnableVoiceChat->set(allow_voice);
-
-                        mCheckEnableVoiceChatParcel->setEnabled( can_change_media && allow_voice );
-                }
-
-                mCheckEnableVoiceChatParcel->set(!parcel->getParcelFlagUseEstateVoiceChannel());
-
-                mMusicURLEdit->setText(parcel->getMusicURL());
-                mMusicURLEdit->setEnabled( can_change_media );
-
-
 
                 childSetText("current_url", parcel->getMediaCurrentURL());