diff options
Diffstat (limited to 'indra/newview')
404 files changed, 3924 insertions, 4067 deletions
diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml index 9f474a39bc..73fb24e4eb 100644 --- a/indra/newview/app_settings/settings.xml +++ b/indra/newview/app_settings/settings.xml @@ -10369,7 +10369,7 @@ <key>Type</key> <string>Boolean</string> <key>Value</key> - <integer>1</integer> + <integer>0</integer> </map> <key>VivoxDebugLevel</key> <map> diff --git a/indra/newview/installers/darwin/release-dmg/_DS_Store b/indra/newview/installers/darwin/release-dmg/_DS_Store Binary files differindex 495ec37f53..8f6c25c2f4 100644 --- a/indra/newview/installers/darwin/release-dmg/_DS_Store +++ b/indra/newview/installers/darwin/release-dmg/_DS_Store diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 7a34112807..3eeaacf93b 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -159,11 +159,11 @@ bool handleSlowMotionAnimation(const LLSD& newvalue) { if (newvalue.asBoolean()) { - gAgent.getAvatarObject()->setAnimTimeFactor(0.2f); + gAgentAvatarp->setAnimTimeFactor(0.2f); } else { - gAgent.getAvatarObject()->setAnimTimeFactor(1.0f); + gAgentAvatarp->setAnimTimeFactor(1.0f); } return true; } @@ -207,8 +207,6 @@ LLAgent::LLAgent() : mDistanceTraveled(0.F), mLastPositionGlobal(LLVector3d::zero), - mAvatarObject(NULL), - mRenderState(0), mTypingTimer(), @@ -294,7 +292,6 @@ void LLAgent::init() //----------------------------------------------------------------------------- void LLAgent::cleanup() { - mAvatarObject = NULL; mRegionp = NULL; } @@ -315,7 +312,7 @@ LLAgent::~LLAgent() //----------------------------------------------------------------------------- void LLAgent::onAppFocusGained() { - if (CAMERA_MODE_MOUSELOOK == gAgentCamera.mCameraMode) + if (CAMERA_MODE_MOUSELOOK == gAgentCamera.getCameraMode()) { gAgentCamera.changeCameraToDefault(); LLToolMgr::getInstance()->clearSavedTool(); @@ -325,12 +322,12 @@ void LLAgent::onAppFocusGained() void LLAgent::ageChat() { - if (mAvatarObject.notNull()) + if (isAgentAvatarValid()) { // get amount of time since I last chatted - F64 elapsed_time = (F64)mAvatarObject->mChatTimer.getElapsedTimeF32(); + F64 elapsed_time = (F64)gAgentAvatarp->mChatTimer.getElapsedTimeF32(); // add in frame time * 3 (so it ages 4x) - mAvatarObject->mChatTimer.setAge(elapsed_time + (F64)gFrameDTClamped * (CHAT_AGE_FAST_RATE - 1.0)); + gAgentAvatarp->mChatTimer.setAge(elapsed_time + (F64)gFrameDTClamped * (CHAT_AGE_FAST_RATE - 1.0)); } } @@ -517,20 +514,20 @@ BOOL LLAgent::getFlying() const //----------------------------------------------------------------------------- void LLAgent::setFlying(BOOL fly) { - if (mAvatarObject.notNull()) + if (isAgentAvatarValid()) { // *HACK: Don't allow to start the flying mode if we got ANIM_AGENT_STANDUP signal // because in this case we won't get a signal to start avatar flying animation and // it will be walking with flying mode "ON" indication. However we allow to switch // the flying mode off if we get ANIM_AGENT_STANDUP signal. See process_avatar_animation(). // See EXT-2781. - if(fly && mAvatarObject->mSignaledAnimations.find(ANIM_AGENT_STANDUP) != mAvatarObject->mSignaledAnimations.end()) + if(fly && gAgentAvatarp->mSignaledAnimations.find(ANIM_AGENT_STANDUP) != gAgentAvatarp->mSignaledAnimations.end()) { return; } // don't allow taking off while sitting - if (fly && mAvatarObject->isSitting()) + if (fly && gAgentAvatarp->isSitting()) { return; } @@ -583,9 +580,9 @@ void LLAgent::toggleFlying() bool LLAgent::enableFlying() { BOOL sitting = FALSE; - if (gAgent.getAvatarObject()) + if (isAgentAvatarValid()) { - sitting = gAgent.getAvatarObject()->isSitting(); + sitting = gAgentAvatarp->isSitting(); } return !sitting; } @@ -755,9 +752,9 @@ void LLAgent::sendReliableMessage() //----------------------------------------------------------------------------- LLVector3 LLAgent::getVelocity() const { - if (mAvatarObject.notNull()) + if (isAgentAvatarValid()) { - return mAvatarObject->getVelocity(); + return gAgentAvatarp->getVelocity(); } else { @@ -776,13 +773,13 @@ void LLAgent::setPositionAgent(const LLVector3 &pos_agent) llerrs << "setPositionAgent is not a number" << llendl; } - if (mAvatarObject.notNull() && mAvatarObject->getParent()) + if (isAgentAvatarValid() && gAgentAvatarp->getParent()) { LLVector3 pos_agent_sitting; LLVector3d pos_agent_d; - LLViewerObject *parent = (LLViewerObject*)mAvatarObject->getParent(); + LLViewerObject *parent = (LLViewerObject*)gAgentAvatarp->getParent(); - pos_agent_sitting = mAvatarObject->getPosition() * parent->getRotation() + parent->getPositionAgent(); + pos_agent_sitting = gAgentAvatarp->getPosition() * parent->getRotation() + parent->getPositionAgent(); pos_agent_d.setVec(pos_agent_sitting); mFrameAgent.setOrigin(pos_agent_sitting); @@ -803,9 +800,9 @@ void LLAgent::setPositionAgent(const LLVector3 &pos_agent) //----------------------------------------------------------------------------- const LLVector3d &LLAgent::getPositionGlobal() const { - if (mAvatarObject.notNull() && !mAvatarObject->mDrawable.isNull()) + if (isAgentAvatarValid() && !gAgentAvatarp->mDrawable.isNull()) { - mPositionGlobal = getPosGlobalFromAgent(mAvatarObject->getRenderPosition()); + mPositionGlobal = getPosGlobalFromAgent(gAgentAvatarp->getRenderPosition()); } else { @@ -820,9 +817,9 @@ const LLVector3d &LLAgent::getPositionGlobal() const //----------------------------------------------------------------------------- const LLVector3 &LLAgent::getPositionAgent() { - if(mAvatarObject.notNull() && !mAvatarObject->mDrawable.isNull()) + if (isAgentAvatarValid() && !gAgentAvatarp->mDrawable.isNull()) { - mFrameAgent.setOrigin(mAvatarObject->getRenderPosition()); + mFrameAgent.setOrigin(gAgentAvatarp->getRenderPosition()); } return mFrameAgent.getOrigin(); @@ -948,21 +945,21 @@ LLVector3 LLAgent::getReferenceUpVector() { // this vector is in the coordinate frame of the avatar's parent object, or the world if none LLVector3 up_vector = LLVector3::z_axis; - if (mAvatarObject.notNull() && - mAvatarObject->getParent() && - mAvatarObject->mDrawable.notNull()) + if (isAgentAvatarValid() && + gAgentAvatarp->getParent() && + gAgentAvatarp->mDrawable.notNull()) { - U32 camera_mode = gAgentCamera.mCameraAnimating ? gAgentCamera.mLastCameraMode : gAgentCamera.mCameraMode; + U32 camera_mode = gAgentCamera.getCameraAnimating() ? gAgentCamera.getLastCameraMode() : gAgentCamera.getCameraMode(); // and in third person... if (camera_mode == CAMERA_MODE_THIRD_PERSON) { // make the up vector point to the absolute +z axis - up_vector = up_vector * ~((LLViewerObject*)mAvatarObject->getParent())->getRenderRotation(); + up_vector = up_vector * ~((LLViewerObject*)gAgentAvatarp->getParent())->getRenderRotation(); } else if (camera_mode == CAMERA_MODE_MOUSELOOK) { // make the up vector point to the avatar's +z axis - up_vector = up_vector * mAvatarObject->mDrawable->getRotation(); + up_vector = up_vector * gAgentAvatarp->mDrawable->getRotation(); } } @@ -998,7 +995,7 @@ F32 LLAgent::clampPitchToLimits(F32 angle) F32 angle_from_skyward = acos( mFrameAgent.getAtAxis() * skyward ); - if (mAvatarObject.notNull() && mAvatarObject->isSitting()) + if (isAgentAvatarValid() && gAgentAvatarp->isSitting()) { look_down_limit = 130.f * DEG_TO_RAD; } @@ -1076,17 +1073,6 @@ void LLAgent::setKey(const S32 direction, S32 &key) //----------------------------------------------------------------------------- U32 LLAgent::getControlFlags() { -/* - // HACK -- avoids maintenance of control flags when camera mode is turned on or off, - // only worries about it when the flags are measured - if (mCameraMode == CAMERA_MODE_MOUSELOOK) - { - if ( !(mControlFlags & AGENT_CONTROL_MOUSELOOK) ) - { - mControlFlags |= AGENT_CONTROL_MOUSELOOK; - } - } -*/ return mControlFlags; } @@ -1182,10 +1168,9 @@ void LLAgent::clearAFK() // Gods can sometimes get into away state (via gestures) // without setting the appropriate control flag. JC - LLVOAvatar* av = mAvatarObject; if (mControlFlags & AGENT_CONTROL_AWAY - || (av - && (av->mSignaledAnimations.find(ANIM_AGENT_AWAY) != av->mSignaledAnimations.end()))) + || (isAgentAvatarValid() + && (gAgentAvatarp->mSignaledAnimations.find(ANIM_AGENT_AWAY) != gAgentAvatarp->mSignaledAnimations.end()))) { sendAnimationRequest(ANIM_AGENT_AWAY, ANIM_REQUEST_STOP); clearControlFlags(AGENT_CONTROL_AWAY); @@ -1246,7 +1231,7 @@ BOOL LLAgent::getBusy() const //----------------------------------------------------------------------------- void LLAgent::startAutoPilotGlobal(const LLVector3d &target_global, const std::string& behavior_name, const LLQuaternion *target_rotation, void (*finish_callback)(BOOL, void *), void *callback_data, F32 stop_distance, F32 rot_threshold) { - if (!gAgent.getAvatarObject()) + if (!isAgentAvatarValid()) { return; } @@ -1307,7 +1292,7 @@ void LLAgent::startAutoPilotGlobal(const LLVector3d &target_global, const std::s LLViewerObject *obj; LLWorld::getInstance()->resolveStepHeightGlobal(NULL, target_global, traceEndPt, targetOnGround, groundNorm, &obj); - F64 target_height = llmax((F64)gAgent.getAvatarObject()->getPelvisToFoot(), target_global.mdV[VZ] - targetOnGround.mdV[VZ]); + F64 target_height = llmax((F64)gAgentAvatarp->getPelvisToFoot(), target_global.mdV[VZ] - targetOnGround.mdV[VZ]); // clamp z value of target to minimum height above ground mAutoPilotTargetGlobal.mdV[VZ] = targetOnGround.mdV[VZ] + target_height; @@ -1407,12 +1392,9 @@ void LLAgent::autoPilot(F32 *delta_yaw) mAutoPilotTargetGlobal = object->getPositionGlobal(); } - if (mAvatarObject.isNull()) - { - return; - } + if (!isAgentAvatarValid()) return; - if (mAvatarObject->mInAir) + if (gAgentAvatarp->mInAir) { setFlying(TRUE); } @@ -1488,9 +1470,9 @@ void LLAgent::autoPilot(F32 *delta_yaw) // If we're flying, handle autopilot points above or below you. if (getFlying() && xy_distance < AUTOPILOT_HEIGHT_ADJUST_DISTANCE) { - if (mAvatarObject.notNull()) + if (isAgentAvatarValid()) { - F64 current_height = mAvatarObject->getPositionGlobal().mdV[VZ]; + F64 current_height = gAgentAvatarp->getPositionGlobal().mdV[VZ]; F32 delta_z = (F32)(mAutoPilotTargetGlobal.mdV[VZ] - current_height); F32 slope = delta_z / xy_distance; if (slope > 0.45f && delta_z > 6.f) @@ -1571,9 +1553,9 @@ void LLAgent::propagate(const F32 dt) pitch(PITCH_RATE * mPitchKey * dt); // handle auto-land behavior - if (mAvatarObject.notNull()) + if (isAgentAvatarValid()) { - BOOL in_air = mAvatarObject->mInAir; + BOOL in_air = gAgentAvatarp->mInAir; LLVector3 land_vel = getVelocity(); land_vel.mV[VZ] = 0.f; @@ -1626,29 +1608,6 @@ std::ostream& operator<<(std::ostream &s, const LLAgent &agent) return s; } - -// ------------------- Beginning of legacy LLCamera hack ---------------------- -// This section is included for legacy LLCamera support until -// it is no longer needed. Some legacy code must exist in -// non-legacy functions, and is labeled with "// legacy" comments. - -//----------------------------------------------------------------------------- -// setAvatarObject() -//----------------------------------------------------------------------------- -void LLAgent::setAvatarObject(LLVOAvatarSelf *avatar) -{ - mAvatarObject = avatar; - - if (!avatar) - { - llinfos << "Setting LLAgent::mAvatarObject to NULL" << llendl; - return; - } - - gAgentCamera.setAvatarObject(avatar); - gAgentWearables.setAvatarObject(avatar); -} - // TRUE if your own avatar needs to be rendered. Usually only // in third person and build. //----------------------------------------------------------------------------- @@ -1768,14 +1727,14 @@ U8 LLAgent::getRenderState() //----------------------------------------------------------------------------- void LLAgent::endAnimationUpdateUI() { - if (gAgentCamera.mCameraMode == gAgentCamera.mLastCameraMode) + if (gAgentCamera.getCameraMode() == gAgentCamera.getLastCameraMode()) { // We're already done endAnimationUpdateUI for this transition. return; } // clean up UI from mode we're leaving - if (gAgentCamera.mLastCameraMode == CAMERA_MODE_MOUSELOOK ) + if (gAgentCamera.getLastCameraMode() == CAMERA_MODE_MOUSELOOK ) { // show mouse cursor gViewerWindow->showCursor(); @@ -1820,26 +1779,26 @@ void LLAgent::endAnimationUpdateUI() } // Disable mouselook-specific animations - if (mAvatarObject.notNull()) + if (isAgentAvatarValid()) { - if( mAvatarObject->isAnyAnimationSignaled(AGENT_GUN_AIM_ANIMS, NUM_AGENT_GUN_AIM_ANIMS) ) + if( gAgentAvatarp->isAnyAnimationSignaled(AGENT_GUN_AIM_ANIMS, NUM_AGENT_GUN_AIM_ANIMS) ) { - if (mAvatarObject->mSignaledAnimations.find(ANIM_AGENT_AIM_RIFLE_R) != mAvatarObject->mSignaledAnimations.end()) + if (gAgentAvatarp->mSignaledAnimations.find(ANIM_AGENT_AIM_RIFLE_R) != gAgentAvatarp->mSignaledAnimations.end()) { sendAnimationRequest(ANIM_AGENT_AIM_RIFLE_R, ANIM_REQUEST_STOP); sendAnimationRequest(ANIM_AGENT_HOLD_RIFLE_R, ANIM_REQUEST_START); } - if (mAvatarObject->mSignaledAnimations.find(ANIM_AGENT_AIM_HANDGUN_R) != mAvatarObject->mSignaledAnimations.end()) + if (gAgentAvatarp->mSignaledAnimations.find(ANIM_AGENT_AIM_HANDGUN_R) != gAgentAvatarp->mSignaledAnimations.end()) { sendAnimationRequest(ANIM_AGENT_AIM_HANDGUN_R, ANIM_REQUEST_STOP); sendAnimationRequest(ANIM_AGENT_HOLD_HANDGUN_R, ANIM_REQUEST_START); } - if (mAvatarObject->mSignaledAnimations.find(ANIM_AGENT_AIM_BAZOOKA_R) != mAvatarObject->mSignaledAnimations.end()) + if (gAgentAvatarp->mSignaledAnimations.find(ANIM_AGENT_AIM_BAZOOKA_R) != gAgentAvatarp->mSignaledAnimations.end()) { sendAnimationRequest(ANIM_AGENT_AIM_BAZOOKA_R, ANIM_REQUEST_STOP); sendAnimationRequest(ANIM_AGENT_HOLD_BAZOOKA_R, ANIM_REQUEST_START); } - if (mAvatarObject->mSignaledAnimations.find(ANIM_AGENT_AIM_BOW_L) != mAvatarObject->mSignaledAnimations.end()) + if (gAgentAvatarp->mSignaledAnimations.find(ANIM_AGENT_AIM_BOW_L) != gAgentAvatarp->mSignaledAnimations.end()) { sendAnimationRequest(ANIM_AGENT_AIM_BOW_L, ANIM_REQUEST_STOP); sendAnimationRequest(ANIM_AGENT_HOLD_BOW_L, ANIM_REQUEST_START); @@ -1847,7 +1806,7 @@ void LLAgent::endAnimationUpdateUI() } } } - else if(gAgentCamera.mLastCameraMode == CAMERA_MODE_CUSTOMIZE_AVATAR) + else if (gAgentCamera.getLastCameraMode() == CAMERA_MODE_CUSTOMIZE_AVATAR) { // make sure we ask to save changes @@ -1858,7 +1817,7 @@ void LLAgent::endAnimationUpdateUI() gMorphView->setVisible( FALSE ); } - if (mAvatarObject.notNull()) + if (isAgentAvatarValid()) { if(mCustomAnim) { @@ -1875,7 +1834,7 @@ void LLAgent::endAnimationUpdateUI() //--------------------------------------------------------------------- // Set up UI for mode we're entering //--------------------------------------------------------------------- - if (gAgentCamera.mCameraMode == CAMERA_MODE_MOUSELOOK) + if (gAgentCamera.getCameraMode() == CAMERA_MODE_MOUSELOOK) { // hide menus gMenuBarView->setVisible(FALSE); @@ -1890,7 +1849,7 @@ void LLAgent::endAnimationUpdateUI() LLPanelStandStopFlying::getInstance()->setVisible(FALSE); // clear out camera lag effect - gAgentCamera.mCameraLag.clearVec(); + gAgentCamera.clearCameraLag(); // JC - Added for always chat in third person option gFocusMgr.setKeyboardFocus(NULL); @@ -1918,49 +1877,49 @@ void LLAgent::endAnimationUpdateUI() gConsole->setVisible( TRUE ); - if (mAvatarObject.notNull()) + if (isAgentAvatarValid()) { // Trigger mouselook-specific animations - if( mAvatarObject->isAnyAnimationSignaled(AGENT_GUN_HOLD_ANIMS, NUM_AGENT_GUN_HOLD_ANIMS) ) + if( gAgentAvatarp->isAnyAnimationSignaled(AGENT_GUN_HOLD_ANIMS, NUM_AGENT_GUN_HOLD_ANIMS) ) { - if (mAvatarObject->mSignaledAnimations.find(ANIM_AGENT_HOLD_RIFLE_R) != mAvatarObject->mSignaledAnimations.end()) + if (gAgentAvatarp->mSignaledAnimations.find(ANIM_AGENT_HOLD_RIFLE_R) != gAgentAvatarp->mSignaledAnimations.end()) { sendAnimationRequest(ANIM_AGENT_HOLD_RIFLE_R, ANIM_REQUEST_STOP); sendAnimationRequest(ANIM_AGENT_AIM_RIFLE_R, ANIM_REQUEST_START); } - if (mAvatarObject->mSignaledAnimations.find(ANIM_AGENT_HOLD_HANDGUN_R) != mAvatarObject->mSignaledAnimations.end()) + if (gAgentAvatarp->mSignaledAnimations.find(ANIM_AGENT_HOLD_HANDGUN_R) != gAgentAvatarp->mSignaledAnimations.end()) { sendAnimationRequest(ANIM_AGENT_HOLD_HANDGUN_R, ANIM_REQUEST_STOP); sendAnimationRequest(ANIM_AGENT_AIM_HANDGUN_R, ANIM_REQUEST_START); } - if (mAvatarObject->mSignaledAnimations.find(ANIM_AGENT_HOLD_BAZOOKA_R) != mAvatarObject->mSignaledAnimations.end()) + if (gAgentAvatarp->mSignaledAnimations.find(ANIM_AGENT_HOLD_BAZOOKA_R) != gAgentAvatarp->mSignaledAnimations.end()) { sendAnimationRequest(ANIM_AGENT_HOLD_BAZOOKA_R, ANIM_REQUEST_STOP); sendAnimationRequest(ANIM_AGENT_AIM_BAZOOKA_R, ANIM_REQUEST_START); } - if (mAvatarObject->mSignaledAnimations.find(ANIM_AGENT_HOLD_BOW_L) != mAvatarObject->mSignaledAnimations.end()) + if (gAgentAvatarp->mSignaledAnimations.find(ANIM_AGENT_HOLD_BOW_L) != gAgentAvatarp->mSignaledAnimations.end()) { sendAnimationRequest(ANIM_AGENT_HOLD_BOW_L, ANIM_REQUEST_STOP); sendAnimationRequest(ANIM_AGENT_AIM_BOW_L, ANIM_REQUEST_START); } } - if (mAvatarObject->getParent()) + if (gAgentAvatarp->getParent()) { LLVector3 at_axis = LLViewerCamera::getInstance()->getAtAxis(); - LLViewerObject* root_object = (LLViewerObject*)mAvatarObject->getRoot(); + LLViewerObject* root_object = (LLViewerObject*)gAgentAvatarp->getRoot(); if (root_object->flagCameraDecoupled()) { resetAxes(at_axis); } else { - resetAxes(at_axis * ~((LLViewerObject*)mAvatarObject->getParent())->getRenderRotation()); + resetAxes(at_axis * ~((LLViewerObject*)gAgentAvatarp->getParent())->getRenderRotation()); } } } } - else if (gAgentCamera.mCameraMode == CAMERA_MODE_CUSTOMIZE_AVATAR) + else if (gAgentCamera.getCameraMode() == CAMERA_MODE_CUSTOMIZE_AVATAR) { LLToolMgr::getInstance()->setCurrentToolset(gFaceEditToolset); @@ -1970,23 +1929,22 @@ void LLAgent::endAnimationUpdateUI() } // freeze avatar - if (mAvatarObject.notNull()) + if (isAgentAvatarValid()) { - mPauseRequest = mAvatarObject->requestPause(); + mPauseRequest = gAgentAvatarp->requestPause(); } } - if (getAvatarObject()) + if (isAgentAvatarValid()) { - getAvatarObject()->updateAttachmentVisibility(gAgentCamera.mCameraMode); + gAgentAvatarp->updateAttachmentVisibility(gAgentCamera.getCameraMode()); } gFloaterTools->dirty(); // Don't let this be called more than once if the camera // mode hasn't changed. --JC - gAgentCamera.mLastCameraMode = gAgentCamera.mCameraMode; - + gAgentCamera.updateLastCamera(); } //----------------------------------------------------------------------------- @@ -2055,10 +2013,10 @@ void LLAgent::setStartPosition( U32 location_id ) LLVector3 agent_pos = getPositionAgent(); - if (mAvatarObject.notNull()) + if (isAgentAvatarValid()) { // the z height is at the agent's feet - agent_pos.mV[VZ] -= 0.5f * mAvatarObject->mBodySize.mV[VZ]; + agent_pos.mV[VZ] -= 0.5f * gAgentAvatarp->mBodySize.mV[VZ]; } agent_pos.mV[VX] = llclamp( agent_pos.mV[VX], INSET, REGION_WIDTH - INSET ); @@ -2165,7 +2123,7 @@ void LLAgent::onAnimStop(const LLUUID& id) setControlFlags(AGENT_CONTROL_FINISH_ANIM); // now trigger dusting self off animation - if (mAvatarObject.notNull() && !mAvatarObject->mBelowWater && rand() % 3 == 0) + if (isAgentAvatarValid() && !gAgentAvatarp->mBelowWater && rand() % 3 == 0) sendAnimationRequest( ANIM_AGENT_BRUSH, ANIM_REQUEST_START ); } else if (id == ANIM_AGENT_PRE_JUMP || id == ANIM_AGENT_LAND || id == ANIM_AGENT_MEDIUM_LAND) @@ -2364,9 +2322,9 @@ void LLAgent::buildFullnameAndTitle(std::string& name) const name.erase(0, name.length()); } - if (mAvatarObject.notNull()) + if (isAgentAvatarValid()) { - name += mAvatarObject->getFullname(); + name += gAgentAvatarp->getFullname(); } } @@ -2512,14 +2470,14 @@ BOOL LLAgent::canJoinGroups() const LLQuaternion LLAgent::getHeadRotation() { - if (mAvatarObject.isNull() || !mAvatarObject->mPelvisp || !mAvatarObject->mHeadp) + if (!isAgentAvatarValid() || !gAgentAvatarp->mPelvisp || !gAgentAvatarp->mHeadp) { return LLQuaternion::DEFAULT; } if (!gAgentCamera.cameraMouselook()) { - return mAvatarObject->getRotation(); + return gAgentAvatarp->getRotation(); } // We must be in mouselook @@ -2528,9 +2486,9 @@ LLQuaternion LLAgent::getHeadRotation() LLVector3 left = up % look_dir; LLQuaternion rot(look_dir, left, up); - if (mAvatarObject->getParent()) + if (gAgentAvatarp->getParent()) { - rot = rot * ~mAvatarObject->getParent()->getRotation(); + rot = rot * ~gAgentAvatarp->getParent()->getRotation(); } return rot; @@ -3153,8 +3111,7 @@ void LLAgent::processAgentCachedTextureResponse(LLMessageSystem *mesgsys, void * { gAgentQueryManager.mNumPendingQueries--; - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (!avatarp || avatarp->isDead()) + if (!isAgentAvatarValid() || gAgentAvatarp->isDead()) { llwarns << "No avatar for user in cached texture update!" << llendl; return; @@ -3187,27 +3144,27 @@ void LLAgent::processAgentCachedTextureResponse(LLMessageSystem *mesgsys, void * if (texture_id.notNull()) { //llinfos << "Received cached texture " << (U32)texture_index << ": " << texture_id << llendl; - avatarp->setCachedBakedTexture(LLVOAvatarDictionary::bakedToLocalTextureIndex((EBakedTextureIndex)texture_index), texture_id); - //avatarp->setTETexture( LLVOAvatar::sBakedTextureIndices[texture_index], texture_id ); + gAgentAvatarp->setCachedBakedTexture(LLVOAvatarDictionary::bakedToLocalTextureIndex((EBakedTextureIndex)texture_index), texture_id); + //gAgentAvatarp->setTETexture( LLVOAvatar::sBakedTextureIndices[texture_index], texture_id ); gAgentQueryManager.mActiveCacheQueries[texture_index] = 0; num_results++; } else { // no cache of this bake. request upload. - avatarp->requestLayerSetUpload((EBakedTextureIndex)texture_index); + gAgentAvatarp->requestLayerSetUpload((EBakedTextureIndex)texture_index); } } } llinfos << "Received cached texture response for " << num_results << " textures." << llendl; - avatarp->updateMeshTextures(); + gAgentAvatarp->updateMeshTextures(); if (gAgentQueryManager.mNumPendingQueries == 0) { // RN: not sure why composites are disabled at this point - avatarp->setCompositeUpdatesEnabled(TRUE); + gAgentAvatarp->setCompositeUpdatesEnabled(TRUE); gAgent.sendAgentSetAppearance(); } } @@ -3260,11 +3217,10 @@ BOOL LLAgent::getHomePosGlobal( LLVector3d* pos_global ) void LLAgent::clearVisualParams(void *data) { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (avatarp) + if (isAgentAvatarValid()) { - avatarp->clearVisualParamWeights(); - avatarp->updateVisualParams(); + gAgentAvatarp->clearVisualParamWeights(); + gAgentAvatarp->updateVisualParams(); } } @@ -3288,16 +3244,15 @@ bool LLAgent::teleportCore(bool is_local) // sync with other viewers. Discuss in DEV-14145/VWR-6744 before reenabling. // Stop all animation before actual teleporting - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (avatarp) + if (isAgentAvatarValid()) { - for ( LLVOAvatar::AnimIterator anim_it= avatarp->mPlayingAnimations.begin(); - anim_it != avatarp->mPlayingAnimations.end(); + for ( LLVOAvatar::AnimIterator anim_it= gAgentAvatarp->mPlayingAnimations.begin(); + anim_it != gAgentAvatarp->mPlayingAnimations.end(); ++anim_it) { - avatarp->stopMotion(anim_it->first); + gAgentAvatarp->stopMotion(anim_it->first); } - avatarp->processAnimationStateChanges(); + gAgentAvatarp->processAnimationStateChanges(); } #endif @@ -3490,13 +3445,11 @@ void LLAgent::stopCurrentAnimations() { // This function stops all current overriding animations on this // avatar, propagating this change back to the server. - - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (avatarp) + if (isAgentAvatarValid()) { for ( LLVOAvatar::AnimIterator anim_it = - avatarp->mPlayingAnimations.begin(); - anim_it != avatarp->mPlayingAnimations.end(); + gAgentAvatarp->mPlayingAnimations.begin(); + anim_it != gAgentAvatarp->mPlayingAnimations.end(); anim_it++) { if (anim_it->first == @@ -3509,7 +3462,7 @@ void LLAgent::stopCurrentAnimations() else { // stop this animation locally - avatarp->stopMotion(anim_it->first, TRUE); + gAgentAvatarp->stopMotion(anim_it->first, TRUE); // ...and tell the server to tell everyone. sendAnimationRequest(anim_it->first, ANIM_REQUEST_STOP); } @@ -3616,7 +3569,7 @@ void LLAgent::requestLeaveGodMode() //----------------------------------------------------------------------------- void LLAgent::sendAgentSetAppearance() { - if (mAvatarObject.isNull()) return; + if (!isAgentAvatarValid()) return; if (gAgentQueryManager.mNumPendingQueries > 0 && !gAgentCamera.cameraCustomizeAvatar()) { @@ -3624,7 +3577,7 @@ void LLAgent::sendAgentSetAppearance() } - llinfos << "TAT: Sent AgentSetAppearance: " << mAvatarObject->getBakedStatusForPrintout() << llendl; + llinfos << "TAT: Sent AgentSetAppearance: " << gAgentAvatarp->getBakedStatusForPrintout() << llendl; //dumpAvatarTEs( "sendAgentSetAppearance()" ); LLMessageSystem* msg = gMessageSystem; @@ -3638,7 +3591,7 @@ void LLAgent::sendAgentSetAppearance() // NOTE -- when we start correcting all of the other Havok geometry // to compensate for the COLLISION_TOLERANCE ugliness we will have // to tweak this number again - const LLVector3 body_size = mAvatarObject->mBodySize; + const LLVector3 body_size = gAgentAvatarp->mBodySize; msg->addVector3Fast(_PREHASH_Size, body_size); // To guard against out of order packets @@ -3648,20 +3601,20 @@ void LLAgent::sendAgentSetAppearance() // is texture data current relative to wearables? // KLW - TAT this will probably need to check the local queue. - BOOL textures_current = mAvatarObject->areTexturesCurrent(); + BOOL textures_current = gAgentAvatarp->areTexturesCurrent(); for(U8 baked_index = 0; baked_index < BAKED_NUM_INDICES; baked_index++ ) { const ETextureIndex texture_index = LLVOAvatarDictionary::bakedToLocalTextureIndex((EBakedTextureIndex)baked_index); // if we're not wearing a skirt, we don't need the texture to be baked - if (texture_index == TEX_SKIRT_BAKED && !mAvatarObject->isWearingWearableType(WT_SKIRT)) + if (texture_index == TEX_SKIRT_BAKED && !gAgentAvatarp->isWearingWearableType(WT_SKIRT)) { continue; } // IMG_DEFAULT_AVATAR means not baked. 0 index should be ignored for baked textures - if (!mAvatarObject->isTextureDefined(texture_index, 0)) + if (!gAgentAvatarp->isTextureDefined(texture_index, 0)) { textures_current = FALSE; break; @@ -3699,7 +3652,7 @@ void LLAgent::sendAgentSetAppearance() msg->addU8Fast(_PREHASH_TextureIndex, (U8)texture_index); } msg->nextBlockFast(_PREHASH_ObjectData); - mAvatarObject->sendAppearanceMessage( gMessageSystem ); + gAgentAvatarp->sendAppearanceMessage( gMessageSystem ); } else { @@ -3712,9 +3665,9 @@ void LLAgent::sendAgentSetAppearance() S32 transmitted_params = 0; - for (LLViewerVisualParam* param = (LLViewerVisualParam*)mAvatarObject->getFirstVisualParam(); + for (LLViewerVisualParam* param = (LLViewerVisualParam*)gAgentAvatarp->getFirstVisualParam(); param; - param = (LLViewerVisualParam*)mAvatarObject->getNextVisualParam()) + param = (LLViewerVisualParam*)gAgentAvatarp->getNextVisualParam()) { if (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE) { diff --git a/indra/newview/llagent.h b/indra/newview/llagent.h index 891ce799d2..55d9b292d7 100644 --- a/indra/newview/llagent.h +++ b/indra/newview/llagent.h @@ -51,7 +51,6 @@ extern const U8 AGENT_STATE_TYPING; // Typing indication extern const U8 AGENT_STATE_EDITING; // Set when agent has objects selected class LLChat; -class LLVOAvatarSelf; class LLViewerRegion; class LLMotion; class LLToolset; @@ -109,7 +108,6 @@ public: virtual ~LLAgent(); void init(); void cleanup(); - void setAvatarObject(LLVOAvatarSelf *avatar); //-------------------------------------------------------------------- // Login @@ -173,20 +171,6 @@ private: /******************************************************************************** ** ** - ** GENERAL ACCESSORS - **/ - -public: - LLVOAvatarSelf* getAvatarObject() const { return mAvatarObject; } -private: - LLPointer<LLVOAvatarSelf> mAvatarObject; // NULL until avatar object sent down from simulator - -/** General Accessors - ** ** - *******************************************************************************/ - -/******************************************************************************** - ** ** ** POSITION **/ @@ -217,7 +201,7 @@ public: // Coordinate System //-------------------------------------------------------------------- public: - LLCoordFrame getFrameAgent() const { return mFrameAgent; } + const LLCoordFrame& getFrameAgent() const { return mFrameAgent; } void initOriginGlobal(const LLVector3d &origin_global); // Only to be used in ONE place void resetAxes(); void resetAxes(const LLVector3 &look_at); // Makes reasonable left and up diff --git a/indra/newview/llagentcamera.cpp b/indra/newview/llagentcamera.cpp index e000d44ab8..8ff55cafca 100644 --- a/indra/newview/llagentcamera.cpp +++ b/indra/newview/llagentcamera.cpp @@ -372,10 +372,9 @@ void LLAgentCamera::unlockView() { if (getFocusOnAvatar()) { - LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); - if (avatarp) + if (isAgentAvatarValid()) { - setFocusGlobal(LLVector3d::zero, avatarp->mID); + setFocusGlobal(LLVector3d::zero, gAgentAvatarp->mID); } setFocusOnAvatar(FALSE, FALSE); // no animation } @@ -852,7 +851,7 @@ void LLAgentCamera::cameraOrbitAround(const F32 radians) } else if (mFocusOnAvatar && (mCameraMode == CAMERA_MODE_THIRD_PERSON || mCameraMode == CAMERA_MODE_FOLLOW)) { - gAgent.getFrameAgent().rotate(radians, gAgent.getReferenceUpVector()); + gAgent.yaw(radians); } else { @@ -1092,30 +1091,25 @@ void LLAgentCamera::updateLookAt(const S32 mouse_x, const S32 mouse_y) { static LLVector3 last_at_axis; - LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); + if (!isAgentAvatarValid()) return; - if (!avatarp) - { - return; - } - - LLQuaternion av_inv_rot = ~avatarp->mRoot.getWorldRotation(); - LLVector3 root_at = LLVector3::x_axis * avatarp->mRoot.getWorldRotation(); + LLQuaternion av_inv_rot = ~gAgentAvatarp->mRoot.getWorldRotation(); + LLVector3 root_at = LLVector3::x_axis * gAgentAvatarp->mRoot.getWorldRotation(); if ((gViewerWindow->getMouseVelocityStat()->getCurrent() < 0.01f) && (root_at * last_at_axis > 0.95f)) { - LLVector3 vel = avatarp->getVelocity(); + LLVector3 vel = gAgentAvatarp->getVelocity(); if (vel.magVecSquared() > 4.f) { - setLookAt(LOOKAT_TARGET_IDLE, avatarp, vel * av_inv_rot); + setLookAt(LOOKAT_TARGET_IDLE, gAgentAvatarp, vel * av_inv_rot); } else { // *FIX: rotate mframeagent by sit object's rotation? - LLQuaternion look_rotation = avatarp->isSitting() ? avatarp->getRenderRotation() : gAgent.getFrameAgent().getQuaternion(); // use camera's current rotation + LLQuaternion look_rotation = gAgentAvatarp->isSitting() ? gAgentAvatarp->getRenderRotation() : gAgent.getFrameAgent().getQuaternion(); // use camera's current rotation LLVector3 look_offset = LLVector3(2.f, 0.f, 0.f) * look_rotation * av_inv_rot; - setLookAt(LOOKAT_TARGET_IDLE, avatarp, look_offset); + setLookAt(LOOKAT_TARGET_IDLE, gAgentAvatarp, look_offset); } last_at_axis = root_at; return; @@ -1125,7 +1119,7 @@ void LLAgentCamera::updateLookAt(const S32 mouse_x, const S32 mouse_y) if (CAMERA_MODE_CUSTOMIZE_AVATAR == getCameraMode()) { - setLookAt(LOOKAT_TARGET_NONE, avatarp, LLVector3(-2.f, 0.f, 0.f)); + setLookAt(LOOKAT_TARGET_NONE, gAgentAvatarp, LLVector3(-2.f, 0.f, 0.f)); } else { @@ -1154,7 +1148,7 @@ void LLAgentCamera::updateLookAt(const S32 mouse_x, const S32 mouse_y) headLookAxis = frameCamera.getAtAxis(); // RN: we use world-space offset for mouselook and freelook //headLookAxis = headLookAxis * av_inv_rot; - setLookAt(lookAtType, avatarp, headLookAxis); + setLookAt(lookAtType, gAgentAvatarp, headLookAxis); } } @@ -1175,15 +1169,13 @@ void LLAgentCamera::updateCamera() validateFocusObject(); - LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); - - if (avatarp && - avatarp->isSitting() && + if (isAgentAvatarValid() && + gAgentAvatarp->isSitting() && camera_mode == CAMERA_MODE_MOUSELOOK) { //Ventrella //changed camera_skyward to the new global "mCameraUpVector" - mCameraUpVector = mCameraUpVector * avatarp->getRenderRotation(); + mCameraUpVector = mCameraUpVector * gAgentAvatarp->getRenderRotation(); //end Ventrella } @@ -1291,7 +1283,7 @@ void LLAgentCamera::updateCamera() //Ventrella if ( mCameraMode == CAMERA_MODE_FOLLOW ) { - if (avatarp) + if (isAgentAvatarValid()) { //-------------------------------------------------------------------------------- // this is where the avatar's position and rotation are given to followCam, and @@ -1299,13 +1291,13 @@ void LLAgentCamera::updateCamera() // (2) focus, and (3) upvector. They can then be queried elsewhere in llAgent. //-------------------------------------------------------------------------------- // *TODO: use combined rotation of frameagent and sit object - LLQuaternion avatarRotationForFollowCam = avatarp->isSitting() ? avatarp->getRenderRotation() : gAgent.getFrameAgent().getQuaternion(); + LLQuaternion avatarRotationForFollowCam = gAgentAvatarp->isSitting() ? gAgentAvatarp->getRenderRotation() : gAgent.getFrameAgent().getQuaternion(); LLFollowCamParams* current_cam = LLFollowCamMgr::getActiveFollowCamParams(); if (current_cam) { mFollowCam.copyParams(*current_cam); - mFollowCam.setSubjectPositionAndRotation( avatarp->getRenderPosition(), avatarRotationForFollowCam ); + mFollowCam.setSubjectPositionAndRotation( gAgentAvatarp->getRenderPosition(), avatarRotationForFollowCam ); mFollowCam.update(); LLViewerJoystick::getInstance()->setCameraNeedsUpdate(true); } @@ -1380,9 +1372,9 @@ void LLAgentCamera::updateCamera() gAgent.setShowAvatar(TRUE); } - if (avatarp && (mCameraMode != CAMERA_MODE_MOUSELOOK)) + if (isAgentAvatarValid() && (mCameraMode != CAMERA_MODE_MOUSELOOK)) { - avatarp->updateAttachmentVisibility(mCameraMode); + gAgentAvatarp->updateAttachmentVisibility(mCameraMode); } } else @@ -1480,40 +1472,40 @@ void LLAgentCamera::updateCamera() } gAgent.setLastPositionGlobal(global_pos); - if (LLVOAvatar::sVisibleInFirstPerson && avatarp && !avatarp->isSitting() && cameraMouselook()) + if (LLVOAvatar::sVisibleInFirstPerson && isAgentAvatarValid() && !gAgentAvatarp->isSitting() && cameraMouselook()) { - LLVector3 head_pos = avatarp->mHeadp->getWorldPosition() + - LLVector3(0.08f, 0.f, 0.05f) * avatarp->mHeadp->getWorldRotation() + - LLVector3(0.1f, 0.f, 0.f) * avatarp->mPelvisp->getWorldRotation(); + LLVector3 head_pos = gAgentAvatarp->mHeadp->getWorldPosition() + + LLVector3(0.08f, 0.f, 0.05f) * gAgentAvatarp->mHeadp->getWorldRotation() + + LLVector3(0.1f, 0.f, 0.f) * gAgentAvatarp->mPelvisp->getWorldRotation(); LLVector3 diff = mCameraPositionAgent - head_pos; - diff = diff * ~avatarp->mRoot.getWorldRotation(); + diff = diff * ~gAgentAvatarp->mRoot.getWorldRotation(); - LLJoint* torso_joint = avatarp->mTorsop; - LLJoint* chest_joint = avatarp->mChestp; + LLJoint* torso_joint = gAgentAvatarp->mTorsop; + LLJoint* chest_joint = gAgentAvatarp->mChestp; LLVector3 torso_scale = torso_joint->getScale(); LLVector3 chest_scale = chest_joint->getScale(); // shorten avatar skeleton to avoid foot interpenetration - if (!avatarp->mInAir) + if (!gAgentAvatarp->mInAir) { LLVector3 chest_offset = LLVector3(0.f, 0.f, chest_joint->getPosition().mV[VZ]) * torso_joint->getWorldRotation(); F32 z_compensate = llclamp(-diff.mV[VZ], -0.2f, 1.f); F32 scale_factor = llclamp(1.f - ((z_compensate * 0.5f) / chest_offset.mV[VZ]), 0.5f, 1.2f); torso_joint->setScale(LLVector3(1.f, 1.f, scale_factor)); - LLJoint* neck_joint = avatarp->mNeckp; + LLJoint* neck_joint = gAgentAvatarp->mNeckp; LLVector3 neck_offset = LLVector3(0.f, 0.f, neck_joint->getPosition().mV[VZ]) * chest_joint->getWorldRotation(); scale_factor = llclamp(1.f - ((z_compensate * 0.5f) / neck_offset.mV[VZ]), 0.5f, 1.2f); chest_joint->setScale(LLVector3(1.f, 1.f, scale_factor)); diff.mV[VZ] = 0.f; } - avatarp->mPelvisp->setPosition(avatarp->mPelvisp->getPosition() + diff); + gAgentAvatarp->mPelvisp->setPosition(gAgentAvatarp->mPelvisp->getPosition() + diff); - avatarp->mRoot.updateWorldMatrixChildren(); + gAgentAvatarp->mRoot.updateWorldMatrixChildren(); - for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin(); - iter != avatarp->mAttachmentPoints.end(); ) + for (LLVOAvatar::attachment_map_t::iterator iter = gAgentAvatarp->mAttachmentPoints.begin(); + iter != gAgentAvatarp->mAttachmentPoints.end(); ) { LLVOAvatar::attachment_map_t::iterator curiter = iter++; LLViewerJointAttachment* attachment = curiter->second; @@ -1537,6 +1529,11 @@ void LLAgentCamera::updateCamera() } } +void LLAgentCamera::updateLastCamera() +{ + mLastCameraMode = mCameraMode; +} + void LLAgentCamera::updateFocusOffset() { validateFocusObject(); @@ -1600,8 +1597,6 @@ LLVector3d LLAgentCamera::calcFocusPositionTargetGlobal() clearFocusObject(); } - LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); - // Ventrella if (mCameraMode == CAMERA_MODE_FOLLOW && mFocusOnAvatar) { @@ -1612,12 +1607,12 @@ LLVector3d LLAgentCamera::calcFocusPositionTargetGlobal() { LLVector3d at_axis(1.0, 0.0, 0.0); LLQuaternion agent_rot = gAgent.getFrameAgent().getQuaternion(); - if (avatarp && avatarp->getParent()) + if (isAgentAvatarValid() && gAgentAvatarp->getParent()) { - LLViewerObject* root_object = (LLViewerObject*)avatarp->getRoot(); + LLViewerObject* root_object = (LLViewerObject*)gAgentAvatarp->getRoot(); if (!root_object->flagCameraDecoupled()) { - agent_rot *= ((LLViewerObject*)(avatarp->getParent()))->getRenderRotation(); + agent_rot *= ((LLViewerObject*)(gAgentAvatarp->getParent()))->getRenderRotation(); } } at_axis = at_axis * agent_rot; @@ -1667,7 +1662,7 @@ LLVector3d LLAgentCamera::calcFocusPositionTargetGlobal() } return mFocusTargetGlobal; } - else if (mSitCameraEnabled && avatarp && avatarp->isSitting() && mSitCameraReferenceObject.notNull()) + else if (mSitCameraEnabled && isAgentAvatarValid() && gAgentAvatarp->isSitting() && mSitCameraReferenceObject.notNull()) { // sit camera LLVector3 object_pos = mSitCameraReferenceObject->getRenderPosition(); @@ -1686,12 +1681,10 @@ LLVector3d LLAgentCamera::calcThirdPersonFocusOffset() { // ...offset from avatar LLVector3d focus_offset; - - LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); LLQuaternion agent_rot = gAgent.getFrameAgent().getQuaternion(); - if (avatarp && avatarp->getParent()) + if (isAgentAvatarValid() && gAgentAvatarp->getParent()) { - agent_rot *= ((LLViewerObject*)(avatarp->getParent()))->getRenderRotation(); + agent_rot *= ((LLViewerObject*)(gAgentAvatarp->getParent()))->getRenderRotation(); } focus_offset = mFocusOffsetInitial[mCameraPreset] * agent_rot; @@ -1700,12 +1693,10 @@ LLVector3d LLAgentCamera::calcThirdPersonFocusOffset() void LLAgentCamera::setupSitCamera() { - LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); - // agent frame entering this function is in world coordinates - if (avatarp && avatarp->getParent()) + if (isAgentAvatarValid() && gAgentAvatarp->getParent()) { - LLQuaternion parent_rot = ((LLViewerObject*)avatarp->getParent())->getRenderRotation(); + LLQuaternion parent_rot = ((LLViewerObject*)gAgentAvatarp->getParent())->getRenderRotation(); // slam agent coordinate frame to proper parent local version LLVector3 at_axis = gAgent.getFrameAgent().getAtAxis(); at_axis.mV[VZ] = 0.f; @@ -1768,13 +1759,11 @@ F32 LLAgentCamera::calcCameraFOVZoomFactor() //----------------------------------------------------------------------------- LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit) { - LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); - // Compute base camera position and look-at points. F32 camera_land_height; - LLVector3d frame_center_global = !avatarp ? + LLVector3d frame_center_global = !isAgentAvatarValid() ? gAgent.getPositionGlobal() : - gAgent.getPosGlobalFromAgent(avatarp->mRoot.getWorldPosition()); + gAgent.getPosGlobalFromAgent(gAgentAvatarp->mRoot.getWorldPosition()); BOOL isConstrained = FALSE; LLVector3d head_offset; @@ -1789,32 +1778,32 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit) }// End Ventrella else if (mCameraMode == CAMERA_MODE_MOUSELOOK) { - if (!avatarp || avatarp->mDrawable.isNull()) + if (!isAgentAvatarValid() || gAgentAvatarp->mDrawable.isNull()) { llwarns << "Null avatar drawable!" << llendl; return LLVector3d::zero; } head_offset.clearVec(); - if (avatarp->isSitting() && avatarp->getParent()) + if (gAgentAvatarp->isSitting() && gAgentAvatarp->getParent()) { - avatarp->updateHeadOffset(); - head_offset.mdV[VX] = avatarp->mHeadOffset.mV[VX]; - head_offset.mdV[VY] = avatarp->mHeadOffset.mV[VY]; - head_offset.mdV[VZ] = avatarp->mHeadOffset.mV[VZ] + 0.1f; - const LLMatrix4& mat = ((LLViewerObject*) avatarp->getParent())->getRenderMatrix(); + gAgentAvatarp->updateHeadOffset(); + head_offset.mdV[VX] = gAgentAvatarp->mHeadOffset.mV[VX]; + head_offset.mdV[VY] = gAgentAvatarp->mHeadOffset.mV[VY]; + head_offset.mdV[VZ] = gAgentAvatarp->mHeadOffset.mV[VZ] + 0.1f; + const LLMatrix4& mat = ((LLViewerObject*) gAgentAvatarp->getParent())->getRenderMatrix(); camera_position_global = gAgent.getPosGlobalFromAgent - ((avatarp->getPosition()+ - LLVector3(head_offset)*avatarp->getRotation()) * mat); + ((gAgentAvatarp->getPosition()+ + LLVector3(head_offset)*gAgentAvatarp->getRotation()) * mat); } else { - head_offset.mdV[VZ] = avatarp->mHeadOffset.mV[VZ]; - if (avatarp->isSitting()) + head_offset.mdV[VZ] = gAgentAvatarp->mHeadOffset.mV[VZ]; + if (gAgentAvatarp->isSitting()) { head_offset.mdV[VZ] += 0.1; } - camera_position_global = gAgent.getPosGlobalFromAgent(avatarp->getRenderPosition());//frame_center_global; - head_offset = head_offset * avatarp->getRenderRotation(); + camera_position_global = gAgent.getPosGlobalFromAgent(gAgentAvatarp->getRenderPosition());//frame_center_global; + head_offset = head_offset * gAgentAvatarp->getRenderRotation(); camera_position_global = camera_position_global + head_offset; } } @@ -1824,8 +1813,8 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit) F32 camera_distance = 0.f; if (mSitCameraEnabled - && avatarp - && avatarp->isSitting() + && isAgentAvatarValid() + && gAgentAvatarp->isSitting() && mSitCameraReferenceObject.notNull()) { // sit camera @@ -1841,9 +1830,9 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit) local_camera_offset = mCameraZoomFraction * getCameraOffsetInitial() * gSavedSettings.getF32("CameraOffsetScale"); // are we sitting down? - if (avatarp && avatarp->getParent()) + if (isAgentAvatarValid() && gAgentAvatarp->getParent()) { - LLQuaternion parent_rot = ((LLViewerObject*)avatarp->getParent())->getRenderRotation(); + LLQuaternion parent_rot = ((LLViewerObject*)gAgentAvatarp->getParent())->getRenderRotation(); // slam agent coordinate frame to proper parent local version LLVector3 at_axis = gAgent.getFrameAgent().getAtAxis() * parent_rot; at_axis.mV[VZ] = 0.f; @@ -1857,7 +1846,7 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit) local_camera_offset = gAgent.getFrameAgent().rotateToAbsolute( local_camera_offset ); } - if (!mCameraCollidePlane.isExactlyZero() && (!avatarp || !avatarp->isSitting())) + if (!mCameraCollidePlane.isExactlyZero() && (!isAgentAvatarValid() || !gAgentAvatarp->isSitting())) { LLVector3 plane_normal; plane_normal.setVec(mCameraCollidePlane.mV); @@ -1910,11 +1899,11 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit) // set the global camera position LLVector3d camera_offset; - LLVector3 av_pos = !avatarp ? LLVector3::zero : avatarp->getRenderPosition(); + LLVector3 av_pos = !isAgentAvatarValid() ? LLVector3::zero : gAgentAvatarp->getRenderPosition(); camera_offset.setVec( local_camera_offset ); camera_position_global = frame_center_global + head_offset + camera_offset; - if (avatarp) + if (isAgentAvatarValid()) { LLVector3d camera_lag_d; F32 lag_interp = LLCriticalDamp::getInterpolant(CAMERA_LAG_HALF_LIFE); @@ -1922,8 +1911,8 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit) LLVector3 vel = gAgent.getVelocity(); // lag by appropriate amount for flying - F32 time_in_air = avatarp->mTimeInAir.getElapsedTimeF32(); - if(!mCameraAnimating && avatarp->mInAir && time_in_air > GROUND_TO_AIR_CAMERA_TRANSITION_START_TIME) + F32 time_in_air = gAgentAvatarp->mTimeInAir.getElapsedTimeF32(); + if(!mCameraAnimating && gAgentAvatarp->mInAir && time_in_air > GROUND_TO_AIR_CAMERA_TRANSITION_START_TIME) { LLVector3 frame_at_axis = gAgent.getFrameAgent().getAtAxis(); frame_at_axis -= projected_vec(frame_at_axis, gAgent.getReferenceUpVector()); @@ -1935,7 +1924,7 @@ LLVector3d LLAgentCamera::calcCameraPositionTargetGlobal(BOOL *hit_limit) lag_interp *= u; - if (gViewerWindow->getLeftMouseDown() && gViewerWindow->getLastPick().mObjectID == avatarp->getID()) + if (gViewerWindow->getLeftMouseDown() && gViewerWindow->getLastPick().mObjectID == gAgentAvatarp->getID()) { // disable camera lag when using mouse-directed steering target_lag.clearVec(); @@ -2136,8 +2125,6 @@ void LLAgentCamera::changeCameraToMouselook(BOOL animate) return; } - LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); - // visibility changes at end of animation gViewerWindow->getWindow()->resetBusyCount(); @@ -2146,10 +2133,10 @@ void LLAgentCamera::changeCameraToMouselook(BOOL animate) LLToolMgr::getInstance()->setCurrentToolset(gMouselookToolset); - if (avatarp) + if (isAgentAvatarValid()) { - avatarp->stopMotion(ANIM_AGENT_BODY_NOISE); - avatarp->stopMotion(ANIM_AGENT_BREATHE_ROT); + gAgentAvatarp->stopMotion(ANIM_AGENT_BODY_NOISE); + gAgentAvatarp->stopMotion(ANIM_AGENT_BREATHE_ROT); } //gViewerWindow->stopGrab(); @@ -2161,7 +2148,7 @@ void LLAgentCamera::changeCameraToMouselook(BOOL animate) { gFocusMgr.setKeyboardFocus(NULL); - mLastCameraMode = mCameraMode; + updateLastCamera(); mCameraMode = CAMERA_MODE_MOUSELOOK; const U32 old_flags = gAgent.getControlFlags(); gAgent.setControlFlags(AGENT_CONTROL_MOUSELOOK); @@ -2223,7 +2210,7 @@ void LLAgentCamera::changeCameraToFollow(BOOL animate) } startCameraAnimation(); - mLastCameraMode = mCameraMode; + updateLastCamera(); mCameraMode = CAMERA_MODE_FOLLOW; // bang-in the current focus, position, and up vector of the follow cam @@ -2234,12 +2221,11 @@ void LLAgentCamera::changeCameraToFollow(BOOL animate) LLToolMgr::getInstance()->setCurrentToolset(gBasicToolset); } - LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); - if (avatarp) + if (isAgentAvatarValid()) { - avatarp->mPelvisp->setPosition(LLVector3::zero); - avatarp->startMotion( ANIM_AGENT_BODY_NOISE ); - avatarp->startMotion( ANIM_AGENT_BREATHE_ROT ); + gAgentAvatarp->mPelvisp->setPosition(LLVector3::zero); + gAgentAvatarp->startMotion( ANIM_AGENT_BODY_NOISE ); + gAgentAvatarp->startMotion( ANIM_AGENT_BREATHE_ROT ); } // unpause avatar animation @@ -2278,15 +2264,14 @@ void LLAgentCamera::changeCameraToThirdPerson(BOOL animate) mCameraZoomFraction = INITIAL_ZOOM_FRACTION; - LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); - if (avatarp) + if (isAgentAvatarValid()) { - if (!avatarp->isSitting()) + if (!gAgentAvatarp->isSitting()) { - avatarp->mPelvisp->setPosition(LLVector3::zero); + gAgentAvatarp->mPelvisp->setPosition(LLVector3::zero); } - avatarp->startMotion(ANIM_AGENT_BODY_NOISE); - avatarp->startMotion(ANIM_AGENT_BREATHE_ROT); + gAgentAvatarp->startMotion(ANIM_AGENT_BODY_NOISE); + gAgentAvatarp->startMotion(ANIM_AGENT_BREATHE_ROT); } LLVector3 at_axis; @@ -2308,7 +2293,7 @@ void LLAgentCamera::changeCameraToThirdPerson(BOOL animate) mTargetCameraDistance = MIN_CAMERA_DISTANCE; animate = FALSE; } - mLastCameraMode = mCameraMode; + updateLastCamera(); mCameraMode = CAMERA_MODE_THIRD_PERSON; const U32 old_flags = gAgent.getControlFlags(); gAgent.clearControlFlags(AGENT_CONTROL_MOUSELOOK); @@ -2320,9 +2305,9 @@ void LLAgentCamera::changeCameraToThirdPerson(BOOL animate) } // Remove any pitch from the avatar - if (avatarp && avatarp->getParent()) + if (isAgentAvatarValid() && gAgentAvatarp->getParent()) { - LLQuaternion obj_rot = ((LLViewerObject*)avatarp->getParent())->getRenderRotation(); + LLQuaternion obj_rot = ((LLViewerObject*)gAgentAvatarp->getParent())->getRenderRotation(); at_axis = LLViewerCamera::getInstance()->getAtAxis(); at_axis.mV[VZ] = 0.f; at_axis.normalize(); @@ -2379,7 +2364,7 @@ void LLAgentCamera::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL came if (mCameraMode != CAMERA_MODE_CUSTOMIZE_AVATAR) { - mLastCameraMode = mCameraMode; + updateLastCamera(); mCameraMode = CAMERA_MODE_CUSTOMIZE_AVATAR; const U32 old_flags = gAgent.getControlFlags(); gAgent.clearControlFlags(AGENT_CONTROL_MOUSELOOK); @@ -2394,8 +2379,7 @@ void LLAgentCamera::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL came LLVOAvatarSelf::onCustomizeStart(); } - LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); - if (avatarp) + if (isAgentAvatarValid()) { if(avatar_animate) { @@ -2407,8 +2391,8 @@ void LLAgentCamera::changeCameraToCustomizeAvatar(BOOL avatar_animate, BOOL came gAgent.sendAnimationRequest(ANIM_AGENT_CUSTOMIZE, ANIM_REQUEST_START); gAgent.setCustomAnim(TRUE); - avatarp->startMotion(ANIM_AGENT_CUSTOMIZE); - LLMotion* turn_motion = avatarp->findMotion(ANIM_AGENT_CUSTOMIZE); + gAgentAvatarp->startMotion(ANIM_AGENT_CUSTOMIZE); + LLMotion* turn_motion = gAgentAvatarp->findMotion(ANIM_AGENT_CUSTOMIZE); if (turn_motion) { @@ -2511,16 +2495,15 @@ void LLAgentCamera::setFocusGlobal(const LLVector3d& focus, const LLUUID &object setFocusObject(gObjectList.findObject(object_id)); LLVector3d old_focus = mFocusTargetGlobal; LLViewerObject *focus_obj = mFocusObject; - LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); // if focus has changed if (old_focus != focus) { if (focus.isExactlyZero()) { - if (avatarp) + if (isAgentAvatarValid()) { - mFocusTargetGlobal = gAgent.getPosGlobalFromAgent(avatarp->mHeadp->getWorldPosition()); + mFocusTargetGlobal = gAgent.getPosGlobalFromAgent(gAgentAvatarp->mHeadp->getWorldPosition()); } else { @@ -2563,9 +2546,9 @@ void LLAgentCamera::setFocusGlobal(const LLVector3d& focus, const LLUUID &object { if (focus.isExactlyZero()) { - if (avatarp) + if (isAgentAvatarValid()) { - mFocusTargetGlobal = gAgent.getPosGlobalFromAgent(avatarp->mHeadp->getWorldPosition()); + mFocusTargetGlobal = gAgent.getPosGlobalFromAgent(gAgentAvatarp->mHeadp->getWorldPosition()); } else { @@ -2702,10 +2685,9 @@ void LLAgentCamera::setFocusOnAvatar(BOOL focus_on_avatar, BOOL animate) if (mCameraMode == CAMERA_MODE_THIRD_PERSON) { LLVector3 at_axis; - LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); - if (avatarp && avatarp->getParent()) + if (isAgentAvatarValid() && gAgentAvatarp->getParent()) { - LLQuaternion obj_rot = ((LLViewerObject*)avatarp->getParent())->getRenderRotation(); + LLQuaternion obj_rot = ((LLViewerObject*)gAgentAvatarp->getParent())->getRenderRotation(); at_axis = LLViewerCamera::getInstance()->getAtAxis(); at_axis.mV[VZ] = 0.f; at_axis.normalize(); @@ -2733,16 +2715,15 @@ void LLAgentCamera::setFocusOnAvatar(BOOL focus_on_avatar, BOOL animate) BOOL LLAgentCamera::setLookAt(ELookAtType target_type, LLViewerObject *object, LLVector3 position) { - LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); if(object && object->isAttachment()) { LLViewerObject* parent = object; while(parent) { - if (parent == avatarp) + if (parent == gAgentAvatarp) { // looking at an attachment on ourselves, which we don't want to do - object = avatarp; + object = gAgentAvatarp; position.clearVec(); } parent = (LLViewerObject*)parent->getParent(); @@ -2751,7 +2732,7 @@ BOOL LLAgentCamera::setLookAt(ELookAtType target_type, LLViewerObject *object, L if(!mLookAt || mLookAt->isDead()) { mLookAt = (LLHUDEffectLookAt *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_LOOKAT); - mLookAt->setSourceObject(avatarp); + mLookAt->setSourceObject(gAgentAvatarp); } return mLookAt->setLookAt(target_type, object, position); @@ -2774,14 +2755,13 @@ void LLAgentCamera::lookAtLastChat() return; } - LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); LLVector3 delta_pos; if (chatter->isAvatar()) { LLVOAvatar *chatter_av = (LLVOAvatar*)chatter; - if (avatarp && chatter_av->mHeadp) + if (isAgentAvatarValid() && chatter_av->mHeadp) { - delta_pos = chatter_av->mHeadp->getWorldPosition() - avatarp->mHeadp->getWorldPosition(); + delta_pos = chatter_av->mHeadp->getWorldPosition() - gAgentAvatarp->mHeadp->getWorldPosition(); } else { @@ -2793,7 +2773,7 @@ void LLAgentCamera::lookAtLastChat() changeCameraToThirdPerson(); - LLVector3 new_camera_pos = avatarp->mHeadp->getWorldPosition(); + LLVector3 new_camera_pos = gAgentAvatarp->mHeadp->getWorldPosition(); LLVector3 left = delta_pos % LLVector3::z_axis; left.normalize(); LLVector3 up = left % delta_pos; @@ -2822,7 +2802,7 @@ void LLAgentCamera::lookAtLastChat() changeCameraToThirdPerson(); - LLVector3 new_camera_pos = avatarp->mHeadp->getWorldPosition(); + LLVector3 new_camera_pos = gAgentAvatarp->mHeadp->getWorldPosition(); LLVector3 left = delta_pos % LLVector3::z_axis; left.normalize(); LLVector3 up = left % delta_pos; @@ -2847,8 +2827,7 @@ BOOL LLAgentCamera::setPointAt(EPointAtType target_type, LLViewerObject *object, if (!mPointAt || mPointAt->isDead()) { mPointAt = (LLHUDEffectPointAt *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_POINTAT); - LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); - mPointAt->setSourceObject(avatarp); + mPointAt->setSourceObject(gAgentAvatarp); } return mPointAt->setPointAt(target_type, object, position); } diff --git a/indra/newview/llagentcamera.h b/indra/newview/llagentcamera.h index 6fe645e7d1..2074864336 100644 --- a/indra/newview/llagentcamera.h +++ b/indra/newview/llagentcamera.h @@ -92,8 +92,6 @@ class LLAgentCamera LOG_CLASS(LLAgentCamera); public: - friend class LLAgent; - //-------------------------------------------------------------------- // Constructors / Destructors //-------------------------------------------------------------------- @@ -121,8 +119,11 @@ public: BOOL cameraCustomizeAvatar() const { return (mCameraMode == CAMERA_MODE_CUSTOMIZE_AVATAR /*&& !mCameraAnimating*/); } BOOL cameraFollow() const { return (mCameraMode == CAMERA_MODE_FOLLOW && mLastCameraMode == CAMERA_MODE_FOLLOW); } ECameraMode getCameraMode() const { return mCameraMode; } + ECameraMode getLastCameraMode() const { return mLastCameraMode; } void updateCamera(); // Call once per frame to update camera location/orientation void resetCamera(); // Slam camera into its default position + void updateLastCamera(); // Set last camera to current camera + private: ECameraMode mCameraMode; // Target mode after transition animation is done ECameraMode mLastCameraMode; @@ -157,6 +158,7 @@ public: BOOL calcCameraMinDistance(F32 &obj_min_distance); F32 calcCustomizeAvatarUIOffset(const LLVector3d& camera_pos_global); F32 getCurrentCameraBuildOffset() { return (F32)mCameraFocusOffset.length(); } + void clearCameraLag() { mCameraLag.clearVec(); } private: F32 mCurrentCameraDistance; // Current camera offset from avatar F32 mTargetCameraDistance; // Target camera offset from avatar diff --git a/indra/newview/llagentui.cpp b/indra/newview/llagentui.cpp index 4601e3241b..c4597ad6f8 100644 --- a/indra/newview/llagentui.cpp +++ b/indra/newview/llagentui.cpp @@ -49,12 +49,10 @@ void LLAgentUI::buildName(std::string& name) { name.clear(); - - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (avatarp) + if (isAgentAvatarValid()) { - LLNameValue *first_nv = avatarp->getNVPair("FirstName"); - LLNameValue *last_nv = avatarp->getNVPair("LastName"); + LLNameValue *first_nv = gAgentAvatarp->getNVPair("FirstName"); + LLNameValue *last_nv = gAgentAvatarp->getNVPair("LastName"); if (first_nv && last_nv) { name = first_nv->printData() + " " + last_nv->printData(); @@ -73,7 +71,8 @@ void LLAgentUI::buildName(std::string& name) //static void LLAgentUI::buildFullname(std::string& name) { - if (gAgent.getAvatarObject()) name = gAgent.getAvatarObject()->getFullname(); + if (isAgentAvatarValid()) + name = gAgentAvatarp->getFullname(); } //static diff --git a/indra/newview/llagentwearables.cpp b/indra/newview/llagentwearables.cpp index 5eb943877a..1fb4cff31a 100644 --- a/indra/newview/llagentwearables.cpp +++ b/indra/newview/llagentwearables.cpp @@ -56,8 +56,6 @@ #include <boost/scoped_ptr.hpp> -#define USE_CURRENT_OUTFIT_FOLDER - //-------------------------------------------------------------------- // Classes for fetching initial wearables data //-------------------------------------------------------------------- @@ -120,9 +118,8 @@ protected: void importedFolderDone(void); void contentsDone(void); enum ELibraryOutfitFetchStep mCurrFetchStep; - typedef std::vector<LLUUID> clothing_folder_vec_t; - clothing_folder_vec_t mLibraryClothingFolders; - clothing_folder_vec_t mImportedClothingFolders; + uuid_vec_t mLibraryClothingFolders; + uuid_vec_t mImportedClothingFolders; bool mOutfitsPopulated; LLUUID mClothingID; LLUUID mLibraryClothingID; @@ -291,7 +288,7 @@ void LLAgentWearables::addWearableToAgentInventoryCallback::fire(const LLUUID& i } if (mTodo & CALL_RECOVERDONE) { - LLAppearanceManager::instance().addCOFItemLink(inv_item,false); + LLAppearanceMgr::instance().addCOFItemLink(inv_item,false); gAgentWearables.recoverMissingWearableDone(); } /* @@ -299,7 +296,7 @@ void LLAgentWearables::addWearableToAgentInventoryCallback::fire(const LLUUID& i */ if (mTodo & CALL_CREATESTANDARDDONE) { - LLAppearanceManager::instance().addCOFItemLink(inv_item,false); + LLAppearanceMgr::instance().addCOFItemLink(inv_item,false); gAgentWearables.createStandardWearablesDone(mType, mIndex); } if (mTodo & CALL_MAKENEWOUTFITDONE) @@ -308,7 +305,7 @@ void LLAgentWearables::addWearableToAgentInventoryCallback::fire(const LLUUID& i } if (mTodo & CALL_WEARITEM) { - LLAppearanceManager::instance().addCOFItemLink(inv_item, true); + LLAppearanceMgr::instance().addCOFItemLink(inv_item, true); } } @@ -485,7 +482,7 @@ void LLAgentWearables::saveWearable(const EWearableType type, const U32 index, B return; } - gAgent.getAvatarObject()->wearableUpdated( type, TRUE ); + gAgentAvatarp->wearableUpdated( type, TRUE ); if (send_update) { @@ -783,8 +780,7 @@ U32 LLAgentWearables::pushWearable(const EWearableType type, LLWearable *wearabl void LLAgentWearables::wearableUpdated(LLWearable *wearable) { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - avatarp->wearableUpdated(wearable->getType(), TRUE); + gAgentAvatarp->wearableUpdated(wearable->getType(), TRUE); wearable->refreshName(); wearable->setLabelUpdated(); @@ -825,11 +821,10 @@ void LLAgentWearables::popWearable(LLWearable *wearable) void LLAgentWearables::popWearable(const EWearableType type, U32 index) { LLWearable *wearable = getWearable(type, index); - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); if (wearable) { mWearableDatas[type].erase(mWearableDatas[type].begin() + index); - avatarp->wearableUpdated(wearable->getType(), TRUE); + gAgentAvatarp->wearableUpdated(wearable->getType(), TRUE); wearable->setLabelUpdated(); } } @@ -961,8 +956,7 @@ void LLAgentWearables::processAgentInitialWearablesUpdate(LLMessageSystem* mesgs LLUUID agent_id; gMessageSystem->getUUIDFast(_PREHASH_AgentData, _PREHASH_AgentID, agent_id); - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (avatarp && (agent_id == avatarp->getID())) + if (isAgentAvatarValid() && (agent_id == gAgentAvatarp->getID())) { gMessageSystem->getU32Fast(_PREHASH_AgentData, _PREHASH_SerialNum, gAgentQueryManager.mUpdateSerialNum); @@ -1028,7 +1022,7 @@ void LLAgentWearables::processAgentInitialWearablesUpdate(LLMessageSystem* mesgs // Get the complete information on the items in the inventory and set up an observer // that will trigger when the complete information is fetched. - LLInventoryFetchDescendentsObserver::folder_ref_t folders; + uuid_vec_t folders; folders.push_back(current_outfit_id); outfit->fetchDescendents(folders); if(outfit->isEverythingComplete()) @@ -1046,64 +1040,6 @@ void LLAgentWearables::processAgentInitialWearablesUpdate(LLMessageSystem* mesgs } } -// A single wearable that the avatar was wearing on start-up has arrived from the database. -// static -void LLAgentWearables::onInitialWearableAssetArrived(LLWearable* wearable, void* userdata) -{ - boost::scoped_ptr<LLInitialWearablesFetch::InitialWearableData> wear_data((LLInitialWearablesFetch::InitialWearableData*)userdata); - const EWearableType type = wear_data->mType; - U32 index = 0; - - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (!avatarp) - { - return; - } - - if (wearable) - { - llassert(type == wearable->getType()); - wearable->setItemID(wear_data->mItemID); - index = gAgentWearables.pushWearable(type, wearable); - gAgentWearables.mItemsAwaitingWearableUpdate.erase(wear_data->mItemID); - - // disable composites if initial textures are baked - avatarp->setupComposites(); - - avatarp->setCompositeUpdatesEnabled(TRUE); - gInventory.addChangedMask(LLInventoryObserver::LABEL, wearable->getItemID()); - } - else - { - // Somehow the asset doesn't exist in the database. - gAgentWearables.recoverMissingWearable(type,index); - } - - - gInventory.notifyObservers(); - - // Have all the wearables that the avatar was wearing at log-in arrived? - // MULTI-WEARABLE: update when multiple wearables can arrive per type. - - gAgentWearables.updateWearablesLoaded(); - if (gAgentWearables.areWearablesLoaded()) - { - - // Can't query cache until all wearables have arrived, so calling this earlier is a no-op. - gAgentWearables.queryWearableCache(); - - // Make sure that the server's idea of the avatar's wearables actually match the wearables. - gAgent.sendAgentSetAppearance(); - - // Check to see if there are any baked textures that we hadn't uploaded before we logged off last time. - // If there are any, schedule them to be uploaded as soon as the layer textures they depend on arrive. - if (gAgentCamera.cameraCustomizeAvatar()) - { - avatarp->requestLayerSetUploads(); - } - } -} - // Normally, all wearables referred to "AgentWearablesUpdate" will correspond to actual assets in the // database. If for some reason, we can't load one of those assets, we can try to reconstruct it so that // the user isn't left without a shape, for example. (We can do that only after the inventory has loaded.) @@ -1179,7 +1115,7 @@ public: { llinfos << "All items created" << llendl; LLPointer<LLInventoryCallback> link_waiter = new LLUpdateAppearanceOnDestroy; - LLAppearanceManager::instance().linkAll(LLAppearanceManager::instance().getCOF(), + LLAppearanceMgr::instance().linkAll(LLAppearanceMgr::instance().getCOF(), mItemsToLink, link_waiter); } @@ -1239,13 +1175,9 @@ void LLAgentWearables::createStandardWearables(BOOL female) llwarns << "Creating Standard " << (female ? "female" : "male") << " Wearables" << llendl; - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (!avatarp) - { - return; - } + if (!isAgentAvatarValid()) return; - avatarp->setSex(female ? SEX_FEMALE : SEX_MALE); + gAgentAvatarp->setSex(female ? SEX_FEMALE : SEX_MALE); const BOOL create[WT_COUNT] = { @@ -1293,11 +1225,8 @@ void LLAgentWearables::createStandardWearablesDone(S32 type, U32 index) { llinfos << "type " << type << " index " << index << llendl; - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (avatarp) - { - avatarp->updateVisualParams(); - } + if (!isAgentAvatarValid()) return; + gAgentAvatarp->updateVisualParams(); } void LLAgentWearables::createStandardWearablesAllDone() @@ -1312,8 +1241,7 @@ void LLAgentWearables::createStandardWearablesAllDone() updateServer(); // Treat this as the first texture entry message, if none received yet - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - avatarp->onFirstTEMessageReceived(); + gAgentAvatarp->onFirstTEMessageReceived(); } // MULTI-WEARABLE: Properly handle multiwearables later. @@ -1335,11 +1263,7 @@ void LLAgentWearables::makeNewOutfit(const std::string& new_folder_name, const LLDynamicArray<S32>& attachments_to_include, BOOL rename_clothing) { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (!avatarp) - { - return; - } + if (!isAgentAvatarValid()) return; // First, make a folder in the Clothes directory. LLUUID folder_id = gInventory.createNewCategory( @@ -1437,7 +1361,7 @@ void LLAgentWearables::makeNewOutfit(const std::string& new_folder_name, for (S32 i = 0; i < attachments_to_include.count(); i++) { S32 attachment_pt = attachments_to_include[i]; - LLViewerJointAttachment* attachment = get_if_there(avatarp->mAttachmentPoints, attachment_pt, (LLViewerJointAttachment*)NULL); + LLViewerJointAttachment* attachment = get_if_there(gAgentAvatarp->mAttachmentPoints, attachment_pt, (LLViewerJointAttachment*)NULL); if (!attachment) continue; for (LLViewerJointAttachment::attachedobjs_vec_t::iterator attachment_iter = attachment->mAttachedObjects.begin(); attachment_iter != attachment->mAttachedObjects.end(); @@ -1498,8 +1422,8 @@ public: tab_outfits->changeOpenClose(tab_outfits->getDisplayChildren()); } - LLAppearanceManager::instance().updateIsDirty(); - LLAppearanceManager::instance().updatePanelOutfitName(""); + LLAppearanceMgr::instance().updateIsDirty(); + LLAppearanceMgr::instance().updatePanelOutfitName(""); } virtual void fire(const LLUUID&) @@ -1512,11 +1436,7 @@ private: LLUUID LLAgentWearables::makeNewOutfitLinks(const std::string& new_folder_name) { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (!avatarp) - { - return LLUUID::null; - } + if (!isAgentAvatarValid()) return LLUUID::null; // First, make a folder in the My Outfits directory. const LLUUID parent_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS); @@ -1526,8 +1446,8 @@ LLUUID LLAgentWearables::makeNewOutfitLinks(const std::string& new_folder_name) new_folder_name); LLPointer<LLInventoryCallback> cb = new LLShowCreatedOutfit(folder_id); - LLAppearanceManager::instance().shallowCopyCategoryContents(LLAppearanceManager::instance().getCOF(),folder_id, cb); - LLAppearanceManager::instance().createBaseOutfitLink(folder_id, cb); + LLAppearanceMgr::instance().shallowCopyCategoryContents(LLAppearanceMgr::instance().getCOF(),folder_id, cb); + LLAppearanceMgr::instance().createBaseOutfitLink(folder_id, cb); return folder_id; } @@ -1680,7 +1600,6 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it BOOL remove) { llinfos << "setWearableOutfit() start" << llendl; - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); BOOL wearables_to_remove[WT_COUNT]; wearables_to_remove[WT_SHAPE] = FALSE; @@ -1784,11 +1703,11 @@ void LLAgentWearables::setWearableOutfit(const LLInventoryItem::item_array_t& it } } - if (avatarp) + if (isAgentAvatarValid()) { - avatarp->setCompositeUpdatesEnabled(TRUE); - avatarp->updateVisualParams(); - avatarp->invalidateAll(); + gAgentAvatarp->setCompositeUpdatesEnabled(TRUE); + gAgentAvatarp->updateVisualParams(); + gAgentAvatarp->invalidateAll(); } // Start rendering & update the server @@ -2038,12 +1957,7 @@ void LLAgentWearables::userUpdateAttachments(LLInventoryModel::item_array_t& obj // already wearing and in request set -> leave alone. // not wearing and in request set -> put on. - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (!avatarp) - { - llwarns << "No avatar found." << llendl; - return; - } + if (!isAgentAvatarValid()) return; std::set<LLUUID> requested_item_ids; std::set<LLUUID> current_item_ids; @@ -2052,8 +1966,8 @@ void LLAgentWearables::userUpdateAttachments(LLInventoryModel::item_array_t& obj // Build up list of objects to be removed and items currently attached. llvo_vec_t objects_to_remove; - for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin(); - iter != avatarp->mAttachmentPoints.end();) + for (LLVOAvatar::attachment_map_t::iterator iter = gAgentAvatarp->mAttachmentPoints.begin(); + iter != gAgentAvatarp->mAttachmentPoints.end();) { LLVOAvatar::attachment_map_t::iterator curiter = iter++; LLViewerJointAttachment* attachment = curiter->second; @@ -2109,12 +2023,7 @@ void LLAgentWearables::userUpdateAttachments(LLInventoryModel::item_array_t& obj void LLAgentWearables::userRemoveMultipleAttachments(llvo_vec_t& objects_to_remove) { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (!avatarp) - { - llwarns << "No avatar found." << llendl; - return; - } + if (!isAgentAvatarValid()) return; if (objects_to_remove.empty()) return; @@ -2137,17 +2046,12 @@ void LLAgentWearables::userRemoveMultipleAttachments(llvo_vec_t& objects_to_remo void LLAgentWearables::userRemoveAllAttachments() { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (!avatarp) - { - llwarns << "No avatar found." << llendl; - return; - } + if (!isAgentAvatarValid()) return; llvo_vec_t objects_to_remove; - for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin(); - iter != avatarp->mAttachmentPoints.end();) + for (LLVOAvatar::attachment_map_t::iterator iter = gAgentAvatarp->mAttachmentPoints.begin(); + iter != gAgentAvatarp->mAttachmentPoints.end();) { LLVOAvatar::attachment_map_t::iterator curiter = iter++; LLViewerJointAttachment* attachment = curiter->second; @@ -2274,7 +2178,7 @@ void LLAgentWearables::populateMyOutfitsFolder(void) // Get the complete information on the items in the inventory and // setup an observer that will wait for that to happen. - LLInventoryFetchDescendentsObserver::folder_ref_t folders; + uuid_vec_t folders; outfits->mMyOutfitsID = gInventory.findCategoryUUIDForType(LLFolderType::FT_MY_OUTFITS); folders.push_back(outfits->mMyOutfitsID); @@ -2365,7 +2269,7 @@ void LLLibraryOutfitsFetch::folderDone(void) mCompleteFolders.clear(); // Get the complete information on the items in the inventory. - LLInventoryFetchDescendentsObserver::folder_ref_t folders; + uuid_vec_t folders; folders.push_back(mClothingID); folders.push_back(mLibraryClothingID); fetchDescendents(folders); @@ -2379,7 +2283,7 @@ void LLLibraryOutfitsFetch::outfitsDone(void) { LLInventoryModel::cat_array_t cat_array; LLInventoryModel::item_array_t wearable_array; - LLInventoryFetchDescendentsObserver::folder_ref_t folders; + uuid_vec_t folders; // Collect the contents of the Library's Clothing folder gInventory.collectDescendents(mLibraryClothingID, cat_array, wearable_array, @@ -2469,7 +2373,7 @@ void LLLibraryOutfitsFetch::libraryDone(void) LLFolderType::FT_NONE, mImportedClothingName); // Copy each folder from library into clothing unless it already exists. - for (clothing_folder_vec_t::const_iterator iter = mLibraryClothingFolders.begin(); + for (uuid_vec_t::const_iterator iter = mLibraryClothingFolders.begin(); iter != mLibraryClothingFolders.end(); ++iter) { @@ -2481,7 +2385,7 @@ void LLLibraryOutfitsFetch::libraryDone(void) continue; } - if (!LLAppearanceManager::getInstance()->getCanMakeFolderIntoOutfit(src_folder_id)) + if (!LLAppearanceMgr::getInstance()->getCanMakeFolderIntoOutfit(src_folder_id)) { llinfos << "Skipping non-outfit folder name:" << cat->getName() << llendl; continue; @@ -2503,14 +2407,14 @@ void LLLibraryOutfitsFetch::libraryDone(void) LLUUID dst_folder_id = gInventory.createNewCategory(mImportedClothingID, LLFolderType::FT_NONE, cat->getName()); - LLAppearanceManager::getInstance()->shallowCopyCategoryContents(src_folder_id, dst_folder_id, copy_waiter); + LLAppearanceMgr::getInstance()->shallowCopyCategoryContents(src_folder_id, dst_folder_id, copy_waiter); } } void LLLibraryOutfitsFetch::importedFolderFetch(void) { // Fetch the contents of the Imported Clothing Folder - LLInventoryFetchDescendentsObserver::folder_ref_t folders; + uuid_vec_t folders; folders.push_back(mImportedClothingID); mCompleteFolders.clear(); @@ -2526,7 +2430,7 @@ void LLLibraryOutfitsFetch::importedFolderDone(void) { LLInventoryModel::cat_array_t cat_array; LLInventoryModel::item_array_t wearable_array; - LLInventoryFetchDescendentsObserver::folder_ref_t folders; + uuid_vec_t folders; // Collect the contents of the Imported Clothing folder gInventory.collectDescendents(mImportedClothingID, cat_array, wearable_array, @@ -2556,7 +2460,7 @@ void LLLibraryOutfitsFetch::contentsDone(void) LLInventoryModel::cat_array_t cat_array; LLInventoryModel::item_array_t wearable_array; - for (clothing_folder_vec_t::const_iterator folder_iter = mImportedClothingFolders.begin(); + for (uuid_vec_t::const_iterator folder_iter = mImportedClothingFolders.begin(); folder_iter != mImportedClothingFolders.end(); ++folder_iter) { @@ -2625,15 +2529,15 @@ void LLInitialWearablesFetch::processContents() gInventory.collectDescendentsIf(mCompleteFolders.front(), cat_array, wearable_array, LLInventoryModel::EXCLUDE_TRASH, is_wearable); - LLAppearanceManager::instance().setAttachmentInvLinkEnable(true); + LLAppearanceMgr::instance().setAttachmentInvLinkEnable(true); if (wearable_array.count() > 0) { - LLAppearanceManager::instance().updateAppearanceFromCOF(); + LLAppearanceMgr::instance().updateAppearanceFromCOF(); } else { // if we're constructing the COF from the wearables message, we don't have a proper outfit link - LLAppearanceManager::instance().setOutfitDirty(true); + LLAppearanceMgr::instance().setOutfitDirty(true); processWearablesMessage(); } delete this; @@ -2670,7 +2574,7 @@ public: link_inventory_item(gAgent.getID(), item->getLinkedUUID(), - LLAppearanceManager::instance().getCOF(), + LLAppearanceMgr::instance().getCOF(), item->getName(), LLAssetType::AT_LINK, link_waiter); @@ -2684,7 +2588,7 @@ void LLInitialWearablesFetch::processWearablesMessage() { if (!mAgentInitialWearables.empty()) // We have an empty current outfit folder, use the message data instead. { - const LLUUID current_outfit_id = LLAppearanceManager::instance().getCOF(); + const LLUUID current_outfit_id = LLAppearanceMgr::instance().getCOF(); LLInventoryFetchObserver::item_ref_t ids; for (U8 i = 0; i < mAgentInitialWearables.size(); ++i) { @@ -2693,16 +2597,7 @@ void LLInitialWearablesFetch::processWearablesMessage() if (wearable_data->mAssetID.notNull()) { -#ifdef USE_CURRENT_OUTFIT_FOLDER ids.push_back(wearable_data->mItemID); -#endif -#if 0 -// // Fetch the wearables -// LLWearableList::instance().getAsset(wearable_data->mAssetID, -// LLStringUtil::null, -// LLWearableDictionary::getAssetType(wearable_data->mType), -// LLAgentWearables::onInitialWearableAssetArrived, (void*)(wearable_data)); -#endif } else { @@ -2713,11 +2608,10 @@ void LLInitialWearablesFetch::processWearablesMessage() } // Add all current attachments to the requested items as well. - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if(avatarp) + if (isAgentAvatarValid()) { - for (LLVOAvatar::attachment_map_t::const_iterator iter = avatarp->mAttachmentPoints.begin(); - iter != avatarp->mAttachmentPoints.end(); ++iter) + for (LLVOAvatar::attachment_map_t::const_iterator iter = gAgentAvatarp->mAttachmentPoints.begin(); + iter != gAgentAvatarp->mAttachmentPoints.end(); ++iter) { LLViewerJointAttachment* attachment = iter->second; if (!attachment) continue; diff --git a/indra/newview/llappearancemgr.cpp b/indra/newview/llappearancemgr.cpp index b3dfb8f141..80d24f75b9 100644 --- a/indra/newview/llappearancemgr.cpp +++ b/indra/newview/llappearancemgr.cpp @@ -119,7 +119,7 @@ protected: // If the inventory callback manager goes away, we're shutting down, no longer want the callback. if( LLInventoryCallbackManager::is_instantiated() ) { - LLAppearanceManager::instance().wearInventoryCategoryOnAvatar(gInventory.getCategory(mCatID), mAppend); + LLAppearanceMgr::instance().wearInventoryCategoryOnAvatar(gInventory.getCategory(mCatID), mAppend); } else { @@ -228,7 +228,7 @@ void LLOutfitObserver::doWearCategory() else { // Wear the inventory category. - LLAppearanceManager::instance().wearInventoryCategoryOnAvatar(gInventory.getCategory(mCatID), mAppend); + LLAppearanceMgr::instance().wearInventoryCategoryOnAvatar(gInventory.getCategory(mCatID), mAppend); } delete this; } @@ -312,7 +312,7 @@ LLUpdateAppearanceOnDestroy::~LLUpdateAppearanceOnDestroy() if (!LLApp::isExiting()) { - LLAppearanceManager::instance().updateAppearanceFromCOF(); + LLAppearanceMgr::instance().updateAppearanceFromCOF(); } } @@ -368,6 +368,7 @@ public: void recoverMissingWearable(EWearableType type); void clearCOFLinksForMissingWearables(); + void onWearableAssetFetch(LLWearable *wearable); void onAllComplete(); typedef std::list<LLFoundData> found_list_t; @@ -450,12 +451,12 @@ void LLWearableHoldingPattern::onAllComplete() { llinfos << "Activating " << mGestItems.count() << " gestures" << llendl; - LLGestureManager::instance().activateGestures(mGestItems); + LLGestureMgr::instance().activateGestures(mGestItems); // Update the inventory item labels to reflect the fact // they are active. LLViewerInventoryCategory* catp = - gInventory.getCategory(LLAppearanceManager::instance().getCOF()); + gInventory.getCategory(LLAppearanceMgr::instance().getCOF()); if (catp) { @@ -466,11 +467,10 @@ void LLWearableHoldingPattern::onAllComplete() // Update wearables. llinfos << "Updating agent wearables with " << mResolved << " wearable items " << llendl; - LLAppearanceManager::instance().updateAgentWearables(this, false); + LLAppearanceMgr::instance().updateAgentWearables(this, false); // Update attachments to match those requested. - LLVOAvatar* avatar = gAgent.getAvatarObject(); - if( avatar ) + if (isAgentAvatarValid()) { llinfos << "Updating " << mObjItems.count() << " attachments" << llendl; LLAgentWearables::userUpdateAttachments(mObjItems); @@ -581,7 +581,7 @@ public: { link_inventory_item( gAgent.getID(), item_id, - LLAppearanceManager::instance().getCOF(), + LLAppearanceMgr::instance().getCOF(), itemp->getName(), LLAssetType::AT_LINK, cb); @@ -632,7 +632,7 @@ void LLWearableHoldingPattern::clearCOFLinksForMissingWearables() { // Wearable link that was never resolved; remove links to it from COF llinfos << "removing link for unresolved item " << data.mItemID.asString() << llendl; - LLAppearanceManager::instance().removeCOFItemLinks(data.mItemID,false); + LLAppearanceMgr::instance().removeCOFItemLinks(data.mItemID,false); } } } @@ -657,11 +657,10 @@ bool LLWearableHoldingPattern::pollMissingWearables() return done; } -static void onWearableAssetFetch(LLWearable* wearable, void* data) +void LLWearableHoldingPattern::onWearableAssetFetch(LLWearable *wearable) { - LLWearableHoldingPattern* holder = (LLWearableHoldingPattern*)data; - holder->mResolved += 1; // just counting callbacks, not successes. - llinfos << "onWearableAssetFetch, resolved count " << holder->mResolved << " of requested " << holder->mFoundList.size() << llendl; + mResolved += 1; // just counting callbacks, not successes. + llinfos << "onWearableAssetFetch, resolved count " << mResolved << " of requested " << mFoundList.size() << llendl; if (wearable) { llinfos << "wearable found, type " << wearable->getType() << " asset " << wearable->getAssetID() << llendl; @@ -671,7 +670,7 @@ static void onWearableAssetFetch(LLWearable* wearable, void* data) llwarns << "no wearable found" << llendl; } - if (holder->mFired) + if (mFired) { llwarns << "called after holder fired" << llendl; return; @@ -682,8 +681,8 @@ static void onWearableAssetFetch(LLWearable* wearable, void* data) return; } - for (LLWearableHoldingPattern::found_list_t::iterator iter = holder->mFoundList.begin(); - iter != holder->mFoundList.end(); ++iter) + for (LLWearableHoldingPattern::found_list_t::iterator iter = mFoundList.begin(); + iter != mFoundList.end(); ++iter) { LLFoundData& data = *iter; if(wearable->getAssetID() == data.mAssetID) @@ -696,6 +695,12 @@ static void onWearableAssetFetch(LLWearable* wearable, void* data) } } +static void onWearableAssetFetch(LLWearable* wearable, void* data) +{ + LLWearableHoldingPattern* holder = (LLWearableHoldingPattern*)data; + holder->onWearableAssetFetch(wearable); +} + static void removeDuplicateItems(LLInventoryModel::item_array_t& items) { @@ -724,13 +729,13 @@ static void removeDuplicateItems(LLInventoryModel::item_array_t& items) items = new_items; } -const LLUUID LLAppearanceManager::getCOF() const +const LLUUID LLAppearanceMgr::getCOF() const { return gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT); } -const LLViewerInventoryItem* LLAppearanceManager::getBaseOutfitLink() +const LLViewerInventoryItem* LLAppearanceMgr::getBaseOutfitLink() { const LLUUID& current_outfit_cat = getCOF(); LLInventoryModel::cat_array_t cat_array; @@ -758,7 +763,7 @@ const LLViewerInventoryItem* LLAppearanceManager::getBaseOutfitLink() return NULL; } -bool LLAppearanceManager::getBaseOutfitName(std::string& name) +bool LLAppearanceMgr::getBaseOutfitName(std::string& name) { const LLViewerInventoryItem* outfit_link = getBaseOutfitLink(); if(outfit_link) @@ -774,15 +779,15 @@ bool LLAppearanceManager::getBaseOutfitName(std::string& name) } // Update appearance from outfit folder. -void LLAppearanceManager::changeOutfit(bool proceed, const LLUUID& category, bool append) +void LLAppearanceMgr::changeOutfit(bool proceed, const LLUUID& category, bool append) { if (!proceed) return; - LLAppearanceManager::instance().updateCOF(category,append); + LLAppearanceMgr::instance().updateCOF(category,append); } // Create a copy of src_id + contents as a subfolder of dst_id. -void LLAppearanceManager::shallowCopyCategory(const LLUUID& src_id, const LLUUID& dst_id, +void LLAppearanceMgr::shallowCopyCategory(const LLUUID& src_id, const LLUUID& dst_id, LLPointer<LLInventoryCallback> cb) { LLInventoryCategory *src_cat = gInventory.getCategory(src_id); @@ -805,7 +810,7 @@ void LLAppearanceManager::shallowCopyCategory(const LLUUID& src_id, const LLUUID } // Copy contents of src_id to dst_id. -void LLAppearanceManager::shallowCopyCategoryContents(const LLUUID& src_id, const LLUUID& dst_id, +void LLAppearanceMgr::shallowCopyCategoryContents(const LLUUID& src_id, const LLUUID& dst_id, LLPointer<LLInventoryCallback> cb) { LLInventoryModel::cat_array_t* cats; @@ -861,7 +866,7 @@ void LLAppearanceManager::shallowCopyCategoryContents(const LLUUID& src_id, cons } } -BOOL LLAppearanceManager::getCanMakeFolderIntoOutfit(const LLUUID& folder_id) +BOOL LLAppearanceMgr::getCanMakeFolderIntoOutfit(const LLUUID& folder_id) { // These are the wearable items that are required for considering this // folder as containing a complete outfit. @@ -893,7 +898,7 @@ BOOL LLAppearanceManager::getCanMakeFolderIntoOutfit(const LLUUID& folder_id) } -void LLAppearanceManager::purgeBaseOutfitLink(const LLUUID& category) +void LLAppearanceMgr::purgeBaseOutfitLink(const LLUUID& category) { LLInventoryModel::cat_array_t cats; LLInventoryModel::item_array_t items; @@ -915,7 +920,7 @@ void LLAppearanceManager::purgeBaseOutfitLink(const LLUUID& category) } } -void LLAppearanceManager::purgeCategory(const LLUUID& category, bool keep_outfit_links) +void LLAppearanceMgr::purgeCategory(const LLUUID& category, bool keep_outfit_links) { LLInventoryModel::cat_array_t cats; LLInventoryModel::item_array_t items; @@ -935,7 +940,7 @@ void LLAppearanceManager::purgeCategory(const LLUUID& category, bool keep_outfit // Keep the last N wearables of each type. For viewer 2.0, N is 1 for // both body parts and clothing items. -void LLAppearanceManager::filterWearableItems( +void LLAppearanceMgr::filterWearableItems( LLInventoryModel::item_array_t& items, S32 max_per_type) { // Divvy items into arrays by wearable type. @@ -971,7 +976,7 @@ void LLAppearanceManager::filterWearableItems( } // Create links to all listed items. -void LLAppearanceManager::linkAll(const LLUUID& category, +void LLAppearanceMgr::linkAll(const LLUUID& category, LLInventoryModel::item_array_t& items, LLPointer<LLInventoryCallback> cb) { @@ -987,7 +992,7 @@ void LLAppearanceManager::linkAll(const LLUUID& category, } } -void LLAppearanceManager::updateCOF(const LLUUID& category, bool append) +void LLAppearanceMgr::updateCOF(const LLUUID& category, bool append) { LLViewerInventoryCategory *pcat = gInventory.getCategory(category); llinfos << "starting, cat " << (pcat ? pcat->getName() : "[UNKNOWN]") << llendl; @@ -1002,9 +1007,9 @@ void LLAppearanceManager::updateCOF(const LLUUID& category, bool append) for(S32 i = 0; i < gest_items.count(); ++i) { LLViewerInventoryItem *gest_item = gest_items.get(i); - if ( LLGestureManager::instance().isGestureActive( gest_item->getLinkedUUID()) ) + if ( LLGestureMgr::instance().isGestureActive( gest_item->getLinkedUUID()) ) { - LLGestureManager::instance().deactivateGesture( gest_item->getLinkedUUID() ); + LLGestureMgr::instance().deactivateGesture( gest_item->getLinkedUUID() ); } } } @@ -1065,7 +1070,7 @@ void LLAppearanceManager::updateCOF(const LLUUID& category, bool append) llinfos << "waiting for LLUpdateAppearanceOnDestroy" << llendl; } -void LLAppearanceManager::updatePanelOutfitName(const std::string& name) +void LLAppearanceMgr::updatePanelOutfitName(const std::string& name) { LLSidepanelAppearance* panel_appearance = dynamic_cast<LLSidepanelAppearance *>(LLSideTray::getInstance()->getPanel("sidepanel_appearance")); @@ -1075,7 +1080,7 @@ void LLAppearanceManager::updatePanelOutfitName(const std::string& name) } } -void LLAppearanceManager::createBaseOutfitLink(const LLUUID& category, LLPointer<LLInventoryCallback> link_waiter) +void LLAppearanceMgr::createBaseOutfitLink(const LLUUID& category, LLPointer<LLInventoryCallback> link_waiter) { const LLUUID cof = getCOF(); LLViewerInventoryCategory* catp = gInventory.getCategory(category); @@ -1093,7 +1098,7 @@ void LLAppearanceManager::createBaseOutfitLink(const LLUUID& category, LLPointer updatePanelOutfitName(new_outfit_name); } -void LLAppearanceManager::updateAgentWearables(LLWearableHoldingPattern* holder, bool append) +void LLAppearanceMgr::updateAgentWearables(LLWearableHoldingPattern* holder, bool append) { lldebugs << "updateAgentWearables()" << llendl; LLInventoryItem::item_array_t items; @@ -1146,7 +1151,7 @@ static void remove_non_link_items(LLInventoryModel::item_array_t &items) items = pruned_items; } -void LLAppearanceManager::updateAppearanceFromCOF() +void LLAppearanceMgr::updateAppearanceFromCOF() { // update dirty flag to see if the state of the COF matches // the saved outfit stored as a folder link @@ -1160,7 +1165,7 @@ void LLAppearanceManager::updateAppearanceFromCOF() LLUUID current_outfit_id = getCOF(); // Find all the wearables that are in the COF's subtree. - lldebugs << "LLAppearanceManager::updateFromCOF()" << llendl; + lldebugs << "LLAppearanceMgr::updateFromCOF()" << llendl; LLInventoryModel::item_array_t wear_items; LLInventoryModel::item_array_t obj_items; LLInventoryModel::item_array_t gest_items; @@ -1186,9 +1191,6 @@ void LLAppearanceManager::updateAppearanceFromCOF() // callback will be called (and this object deleted) // before the final getNextData(). - // BAP future cleanup - no point having found_container when - // mFoundList already has all the info. - LLDynamicArray<LLFoundData> found_container; for(S32 i = 0; i < wear_items.count(); ++i) { LLViewerInventoryItem *item = wear_items.get(i); @@ -1214,7 +1216,6 @@ void LLAppearanceManager::updateAppearanceFromCOF() #endif holder->mFoundList.push_front(found); - found_container.put(found); } else { @@ -1229,9 +1230,10 @@ void LLAppearanceManager::updateAppearanceFromCOF() } } - for(S32 i = 0; i < found_container.count(); ++i) + for (LLWearableHoldingPattern::found_list_t::iterator it = holder->mFoundList.begin(); + it != holder->mFoundList.end(); ++it) { - LLFoundData& found = found_container.get(i); + LLFoundData& found = *it; llinfos << "waiting for onWearableAssetFetch callback, asset " << found.mAssetID.asString() << llendl; @@ -1248,10 +1250,9 @@ void LLAppearanceManager::updateAppearanceFromCOF() { doOnIdleRepeating(boost::bind(&LLWearableHoldingPattern::pollFetchCompletion,holder)); } - } -void LLAppearanceManager::getDescendentsOfAssetType(const LLUUID& category, +void LLAppearanceMgr::getDescendentsOfAssetType(const LLUUID& category, LLInventoryModel::item_array_t& items, LLAssetType::EType type, bool follow_folder_links) @@ -1266,7 +1267,7 @@ void LLAppearanceManager::getDescendentsOfAssetType(const LLUUID& category, follow_folder_links); } -void LLAppearanceManager::getUserDescendents(const LLUUID& category, +void LLAppearanceMgr::getUserDescendents(const LLUUID& category, LLInventoryModel::item_array_t& wear_items, LLInventoryModel::item_array_t& obj_items, LLInventoryModel::item_array_t& gest_items, @@ -1301,7 +1302,7 @@ void LLAppearanceManager::getUserDescendents(const LLUUID& category, follow_folder_links); } -void LLAppearanceManager::wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append) +void LLAppearanceMgr::wearInventoryCategory(LLInventoryCategory* category, bool copy, bool append) { if(!category) return; @@ -1312,7 +1313,7 @@ void LLAppearanceManager::wearInventoryCategory(LLInventoryCategory* category, b // the inventory, and set up an observer that will wait for that to // happen. LLOutfitFetch* outfit_fetcher = new LLOutfitFetch(copy, append); - LLInventoryFetchDescendentsObserver::folder_ref_t folders; + uuid_vec_t folders; folders.push_back(category->getUUID()); outfit_fetcher->fetchDescendents(folders); //inc_busy_count(); @@ -1330,7 +1331,7 @@ void LLAppearanceManager::wearInventoryCategory(LLInventoryCategory* category, b } // *NOTE: hack to get from avatar inventory to avatar -void LLAppearanceManager::wearInventoryCategoryOnAvatar( LLInventoryCategory* category, bool append ) +void LLAppearanceMgr::wearInventoryCategoryOnAvatar( LLInventoryCategory* category, bool append ) { // Avoid unintentionally overwriting old wearables. We have to do // this up front to avoid having to deal with the case of multiple @@ -1342,17 +1343,17 @@ void LLAppearanceManager::wearInventoryCategoryOnAvatar( LLInventoryCategory* ca if( gFloaterCustomize ) { - gFloaterCustomize->askToSaveIfDirty(boost::bind(&LLAppearanceManager::changeOutfit, - &LLAppearanceManager::instance(), + gFloaterCustomize->askToSaveIfDirty(boost::bind(&LLAppearanceMgr::changeOutfit, + &LLAppearanceMgr::instance(), _1, category->getUUID(), append)); } else { - LLAppearanceManager::changeOutfit(TRUE, category->getUUID(), append); + LLAppearanceMgr::changeOutfit(TRUE, category->getUUID(), append); } } -void LLAppearanceManager::wearOutfitByName(const std::string& name) +void LLAppearanceMgr::wearOutfitByName(const std::string& name) { llinfos << "Wearing category " << name << llendl; //inc_busy_count(); @@ -1388,7 +1389,7 @@ void LLAppearanceManager::wearOutfitByName(const std::string& name) if(cat) { - LLAppearanceManager::wearInventoryCategory(cat, copy_items, false); + LLAppearanceMgr::wearInventoryCategory(cat, copy_items, false); } else { @@ -1424,7 +1425,7 @@ public: if (item) { gInventory.removeObserver(this); - LLAppearanceManager::instance().addCOFItemLink(item,mDoUpdate); + LLAppearanceMgr::instance().addCOFItemLink(item,mDoUpdate); delete this; } } @@ -1435,7 +1436,7 @@ private: }; -void LLAppearanceManager::addCOFItemLink(const LLUUID &item_id, bool do_update ) +void LLAppearanceMgr::addCOFItemLink(const LLUUID &item_id, bool do_update ) { const LLInventoryItem *item = gInventory.getItem(item_id); if (!item) @@ -1449,7 +1450,7 @@ void LLAppearanceManager::addCOFItemLink(const LLUUID &item_id, bool do_update ) } } -void LLAppearanceManager::addCOFItemLink(const LLInventoryItem *item, bool do_update ) +void LLAppearanceMgr::addCOFItemLink(const LLInventoryItem *item, bool do_update ) { const LLViewerInventoryItem *vitem = dynamic_cast<const LLViewerInventoryItem*>(item); if (!vitem) @@ -1462,7 +1463,7 @@ void LLAppearanceManager::addCOFItemLink(const LLInventoryItem *item, bool do_up LLInventoryModel::cat_array_t cat_array; LLInventoryModel::item_array_t item_array; - gInventory.collectDescendents(LLAppearanceManager::getCOF(), + gInventory.collectDescendents(LLAppearanceMgr::getCOF(), cat_array, item_array, LLInventoryModel::EXCLUDE_TRASH); @@ -1490,7 +1491,7 @@ void LLAppearanceManager::addCOFItemLink(const LLInventoryItem *item, bool do_up { if (do_update) { - LLAppearanceManager::updateAppearanceFromCOF(); + LLAppearanceMgr::updateAppearanceFromCOF(); } return; } @@ -1507,7 +1508,8 @@ void LLAppearanceManager::addCOFItemLink(const LLInventoryItem *item, bool do_up return; } -void LLAppearanceManager::addEnsembleLink( LLInventoryCategory* cat, bool do_update ) +// BAP remove ensemble code for 2.1? +void LLAppearanceMgr::addEnsembleLink( LLInventoryCategory* cat, bool do_update ) { #if SUPPORT_ENSEMBLES // BAP add check for already in COF. @@ -1521,13 +1523,13 @@ void LLAppearanceManager::addEnsembleLink( LLInventoryCategory* cat, bool do_upd #endif } -void LLAppearanceManager::removeCOFItemLinks(const LLUUID& item_id, bool do_update) +void LLAppearanceMgr::removeCOFItemLinks(const LLUUID& item_id, bool do_update) { gInventory.addChangedMask(LLInventoryObserver::LABEL, item_id); LLInventoryModel::cat_array_t cat_array; LLInventoryModel::item_array_t item_array; - gInventory.collectDescendents(LLAppearanceManager::getCOF(), + gInventory.collectDescendents(LLAppearanceMgr::getCOF(), cat_array, item_array, LLInventoryModel::EXCLUDE_TRASH); @@ -1541,11 +1543,11 @@ void LLAppearanceManager::removeCOFItemLinks(const LLUUID& item_id, bool do_upda } if (do_update) { - LLAppearanceManager::updateAppearanceFromCOF(); + LLAppearanceMgr::updateAppearanceFromCOF(); } } -void LLAppearanceManager::updateIsDirty() +void LLAppearanceMgr::updateIsDirty() { LLUUID cof = getCOF(); LLUUID base_outfit; @@ -1614,7 +1616,7 @@ void LLAppearanceManager::updateIsDirty() } } -void LLAppearanceManager::onFirstFullyVisible() +void LLAppearanceMgr::onFirstFullyVisible() { // If this is the very first time the user has logged into viewer2+ (from a legacy viewer, or new account) // then auto-populate outfits from the library into the My Outfits folder. @@ -1633,7 +1635,7 @@ void LLAppearanceManager::onFirstFullyVisible() //#define DUMP_CAT_VERBOSE -void LLAppearanceManager::dumpCat(const LLUUID& cat_id, const std::string& msg) +void LLAppearanceMgr::dumpCat(const LLUUID& cat_id, const std::string& msg) { LLInventoryModel::cat_array_t cats; LLInventoryModel::item_array_t items; @@ -1654,7 +1656,7 @@ void LLAppearanceManager::dumpCat(const LLUUID& cat_id, const std::string& msg) llinfos << msg << " count " << items.count() << llendl; } -void LLAppearanceManager::dumpItemArray(const LLInventoryModel::item_array_t& items, +void LLAppearanceMgr::dumpItemArray(const LLInventoryModel::item_array_t& items, const std::string& msg) { llinfos << msg << llendl; @@ -1666,17 +1668,17 @@ void LLAppearanceManager::dumpItemArray(const LLInventoryModel::item_array_t& it llinfos << llendl; } -LLAppearanceManager::LLAppearanceManager(): +LLAppearanceMgr::LLAppearanceMgr(): mAttachmentInvLinkEnabled(false), mOutfitIsDirty(false) { } -LLAppearanceManager::~LLAppearanceManager() +LLAppearanceMgr::~LLAppearanceMgr() { } -void LLAppearanceManager::setAttachmentInvLinkEnable(bool val) +void LLAppearanceMgr::setAttachmentInvLinkEnable(bool val) { llinfos << "setAttachmentInvLinkEnable => " << (int) val << llendl; mAttachmentInvLinkEnabled = val; @@ -1699,7 +1701,7 @@ void dumpAttachmentSet(const std::set<LLUUID>& atts, const std::string& msg) llinfos << llendl; } -void LLAppearanceManager::registerAttachment(const LLUUID& item_id) +void LLAppearanceMgr::registerAttachment(const LLUUID& item_id) { mRegisteredAttachments.insert(item_id); gInventory.addChangedMask(LLInventoryObserver::LABEL, item_id); @@ -1707,7 +1709,7 @@ void LLAppearanceManager::registerAttachment(const LLUUID& item_id) if (mAttachmentInvLinkEnabled) { - LLAppearanceManager::addCOFItemLink(item_id, false); // Add COF link for item. + LLAppearanceMgr::addCOFItemLink(item_id, false); // Add COF link for item. } else { @@ -1715,7 +1717,7 @@ void LLAppearanceManager::registerAttachment(const LLUUID& item_id) } } -void LLAppearanceManager::unregisterAttachment(const LLUUID& item_id) +void LLAppearanceMgr::unregisterAttachment(const LLUUID& item_id) { mRegisteredAttachments.erase(item_id); gInventory.addChangedMask(LLInventoryObserver::LABEL, item_id); @@ -1724,8 +1726,8 @@ void LLAppearanceManager::unregisterAttachment(const LLUUID& item_id) if (mAttachmentInvLinkEnabled) { - //LLAppearanceManager::dumpCat(LLAppearanceManager::getCOF(),"Removing attachment link:"); - LLAppearanceManager::removeCOFItemLinks(item_id, false); + //LLAppearanceMgr::dumpCat(LLAppearanceMgr::getCOF(),"Removing attachment link:"); + LLAppearanceMgr::removeCOFItemLinks(item_id, false); } else { @@ -1733,7 +1735,7 @@ void LLAppearanceManager::unregisterAttachment(const LLUUID& item_id) } } -void LLAppearanceManager::linkRegisteredAttachments() +void LLAppearanceMgr::linkRegisteredAttachments() { for (std::set<LLUUID>::iterator it = mRegisteredAttachments.begin(); it != mRegisteredAttachments.end(); @@ -1745,12 +1747,12 @@ void LLAppearanceManager::linkRegisteredAttachments() mRegisteredAttachments.clear(); } -BOOL LLAppearanceManager::getIsInCOF(const LLUUID& obj_id) const +BOOL LLAppearanceMgr::getIsInCOF(const LLUUID& obj_id) const { return gInventory.isObjectDescendentOf(obj_id, getCOF()); } -BOOL LLAppearanceManager::getIsProtectedCOFItem(const LLUUID& obj_id) const +BOOL LLAppearanceMgr::getIsProtectedCOFItem(const LLUUID& obj_id) const { if (!getIsInCOF(obj_id)) return FALSE; diff --git a/indra/newview/llappearancemgr.h b/indra/newview/llappearancemgr.h index 9d6cd34ad7..2d6a0a10ed 100644 --- a/indra/newview/llappearancemgr.h +++ b/indra/newview/llappearancemgr.h @@ -43,9 +43,9 @@ class LLWearable; class LLWearableHoldingPattern; class LLInventoryCallback; -class LLAppearanceManager: public LLSingleton<LLAppearanceManager> +class LLAppearanceMgr: public LLSingleton<LLAppearanceMgr> { - friend class LLSingleton<LLAppearanceManager>; + friend class LLSingleton<LLAppearanceMgr>; public: void updateAppearanceFromCOF(); @@ -120,8 +120,8 @@ public: void onFirstFullyVisible(); protected: - LLAppearanceManager(); - ~LLAppearanceManager(); + LLAppearanceMgr(); + ~LLAppearanceMgr(); private: @@ -324,7 +324,7 @@ template <class T> void callAfterCategoryFetch(const LLUUID& cat_id, T callable) { CallAfterCategoryFetchStage1<T> *stage1 = new CallAfterCategoryFetchStage1<T>(callable); - LLInventoryFetchDescendentsObserver::folder_ref_t folders; + uuid_vec_t folders; folders.push_back(cat_id); stage1->fetchDescendents(folders); if (stage1->isEverythingComplete()) diff --git a/indra/newview/llappviewer.cpp b/indra/newview/llappviewer.cpp index 2fd840d85e..43c8c679c6 100644 --- a/indra/newview/llappviewer.cpp +++ b/indra/newview/llappviewer.cpp @@ -79,6 +79,7 @@ #include "lllocationhistory.h" #include "llfasttimerview.h" #include "llvoicechannel.h" +#include "llvoavatarself.h" #include "llsidetray.h" @@ -356,7 +357,7 @@ void request_initial_instant_messages() if (!requested && gMessageSystem && LLMuteList::getInstance()->isLoaded() - && gAgent.getAvatarObject()) + && isAgentAvatarValid()) { // Auto-accepted inventory items may require the avatar object // to build a correct name. Likewise, inventory offers from @@ -3619,7 +3620,7 @@ void LLAppViewer::idle() // Handle pending gesture processing static LLFastTimer::DeclareTimer ftm("Agent Position"); LLFastTimer t(ftm); - LLGestureManager::instance().update(); + LLGestureMgr::instance().update(); gAgent.updateAgentPosition(gFrameDTClamped, yaw, current_mouse.mX, current_mouse.mY); } diff --git a/indra/newview/llassetuploadresponders.cpp b/indra/newview/llassetuploadresponders.cpp index 2bd3728ab7..370ecc0665 100644 --- a/indra/newview/llassetuploadresponders.cpp +++ b/indra/newview/llassetuploadresponders.cpp @@ -487,10 +487,10 @@ void LLUpdateAgentInventoryResponder::uploadComplete(const LLSD& content) { // If this gesture is active, then we need to update the in-memory // active map with the new pointer. - if (LLGestureManager::instance().isGestureActive(item_id)) + if (LLGestureMgr::instance().isGestureActive(item_id)) { LLUUID asset_id = new_item->getAssetUUID(); - LLGestureManager::instance().replaceGesture(item_id, asset_id); + LLGestureMgr::instance().replaceGesture(item_id, asset_id); gInventory.notifyObservers(); } diff --git a/indra/newview/llavataractions.cpp b/indra/newview/llavataractions.cpp index e6666c7f83..4075ad8ee2 100644 --- a/indra/newview/llavataractions.cpp +++ b/indra/newview/llavataractions.cpp @@ -113,13 +113,13 @@ void LLAvatarActions::removeFriendDialog(const LLUUID& id) if (id.isNull()) return; - std::vector<LLUUID> ids; + uuid_vec_t ids; ids.push_back(id); removeFriendsDialog(ids); } // static -void LLAvatarActions::removeFriendsDialog(const std::vector<LLUUID>& ids) +void LLAvatarActions::removeFriendsDialog(const uuid_vec_t& ids) { if(ids.size() == 0) return; @@ -144,7 +144,7 @@ void LLAvatarActions::removeFriendsDialog(const std::vector<LLUUID>& ids) } LLSD payload; - for (std::vector<LLUUID>::const_iterator it = ids.begin(); it != ids.end(); ++it) + for (uuid_vec_t::const_iterator it = ids.begin(); it != ids.end(); ++it) { payload["ids"].append(*it); } @@ -167,7 +167,7 @@ void LLAvatarActions::offerTeleport(const LLUUID& invitee) } // static -void LLAvatarActions::offerTeleport(const std::vector<LLUUID>& ids) +void LLAvatarActions::offerTeleport(const uuid_vec_t& ids) { if (ids.size() == 0) return; @@ -228,7 +228,7 @@ void LLAvatarActions::startCall(const LLUUID& id) } // static -void LLAvatarActions::startAdhocCall(const std::vector<LLUUID>& ids) +void LLAvatarActions::startAdhocCall(const uuid_vec_t& ids) { if (ids.size() == 0) { @@ -237,7 +237,7 @@ void LLAvatarActions::startAdhocCall(const std::vector<LLUUID>& ids) // convert vector into LLDynamicArray for addSession LLDynamicArray<LLUUID> id_array; - for (std::vector<LLUUID>::const_iterator it = ids.begin(); it != ids.end(); ++it) + for (uuid_vec_t::const_iterator it = ids.begin(); it != ids.end(); ++it) { id_array.push_back(*it); } @@ -278,11 +278,11 @@ bool LLAvatarActions::canCall() } // static -void LLAvatarActions::startConference(const std::vector<LLUUID>& ids) +void LLAvatarActions::startConference(const uuid_vec_t& ids) { // *HACK: Copy into dynamic array LLDynamicArray<LLUUID> id_array; - for (std::vector<LLUUID>::const_iterator it = ids.begin(); it != ids.end(); ++it) + for (uuid_vec_t::const_iterator it = ids.begin(); it != ids.end(); ++it) { id_array.push_back(*it); } @@ -499,7 +499,7 @@ bool LLAvatarActions::handlePay(const LLSD& notification, const LLSD& response, // static void LLAvatarActions::callback_invite_to_group(LLUUID group_id, LLUUID id) { - std::vector<LLUUID> agent_ids; + uuid_vec_t agent_ids; agent_ids.push_back(id); LLFloaterGroupInvite::showForGroup(group_id, &agent_ids); diff --git a/indra/newview/llavataractions.h b/indra/newview/llavataractions.h index a7f3acad4f..c573144a33 100644 --- a/indra/newview/llavataractions.h +++ b/indra/newview/llavataractions.h @@ -60,13 +60,13 @@ public: * Show a friend removal dialog. */ static void removeFriendDialog(const LLUUID& id); - static void removeFriendsDialog(const std::vector<LLUUID>& ids); + static void removeFriendsDialog(const uuid_vec_t& ids); /** * Show teleport offer dialog. */ static void offerTeleport(const LLUUID& invitee); - static void offerTeleport(const std::vector<LLUUID>& ids); + static void offerTeleport(const uuid_vec_t& ids); /** * Start instant messaging session. @@ -86,12 +86,12 @@ public: /** * Start an ad-hoc conference voice call with multiple users */ - static void startAdhocCall(const std::vector<LLUUID>& ids); + static void startAdhocCall(const uuid_vec_t& ids); /** * Start conference chat with the given avatars. */ - static void startConference(const std::vector<LLUUID>& ids); + static void startConference(const uuid_vec_t& ids); /** * Show avatar profile. diff --git a/indra/newview/llavatarlist.cpp b/indra/newview/llavatarlist.cpp index 45c540b3a3..e8abdd32ec 100644 --- a/indra/newview/llavatarlist.cpp +++ b/indra/newview/llavatarlist.cpp @@ -204,17 +204,17 @@ void LLAvatarList::refresh() bool have_filter = !mNameFilter.empty(); // Save selection. - std::vector<LLUUID> selected_ids; + uuid_vec_t selected_ids; getSelectedUUIDs(selected_ids); LLUUID current_id = getSelectedUUID(); // Determine what to add and what to remove. - std::vector<LLUUID> added, removed; + uuid_vec_t added, removed; LLAvatarList::computeDifference(getIDs(), added, removed); // Handle added items. unsigned nadded = 0; - for (std::vector<LLUUID>::const_iterator it=added.begin(); it != added.end(); it++) + for (uuid_vec_t::const_iterator it=added.begin(); it != added.end(); it++) { std::string name; const LLUUID& buddy_id = *it; @@ -236,7 +236,7 @@ void LLAvatarList::refresh() } // Handle removed items. - for (std::vector<LLUUID>::const_iterator it=removed.begin(); it != removed.end(); it++) + for (uuid_vec_t::const_iterator it=removed.begin(); it != removed.end(); it++) { removeItemByUUID(*it); modified = true; @@ -358,7 +358,7 @@ BOOL LLAvatarList::handleRightMouseDown(S32 x, S32 y, MASK mask) BOOL handled = LLUICtrl::handleRightMouseDown(x, y, mask); if ( mContextMenu ) { - std::vector<LLUUID> selected_uuids; + uuid_vec_t selected_uuids; getSelectedUUIDs(selected_uuids); mContextMenu->show(this, selected_uuids, x, y); } @@ -366,12 +366,12 @@ BOOL LLAvatarList::handleRightMouseDown(S32 x, S32 y, MASK mask) } void LLAvatarList::computeDifference( - const std::vector<LLUUID>& vnew_unsorted, - std::vector<LLUUID>& vadded, - std::vector<LLUUID>& vremoved) + const uuid_vec_t& vnew_unsorted, + uuid_vec_t& vadded, + uuid_vec_t& vremoved) { - std::vector<LLUUID> vcur; - std::vector<LLUUID> vnew = vnew_unsorted; + uuid_vec_t vcur; + uuid_vec_t vnew = vnew_unsorted; // Convert LLSDs to LLUUIDs. { @@ -385,7 +385,7 @@ void LLAvatarList::computeDifference( std::sort(vcur.begin(), vcur.end()); std::sort(vnew.begin(), vnew.end()); - std::vector<LLUUID>::iterator it; + uuid_vec_t::iterator it; size_t maxsize = llmax(vcur.size(), vnew.size()); vadded.resize(maxsize); vremoved.resize(maxsize); diff --git a/indra/newview/llavatarlist.h b/indra/newview/llavatarlist.h index 00c72f1f9d..c3f79dcb3a 100644 --- a/indra/newview/llavatarlist.h +++ b/indra/newview/llavatarlist.h @@ -53,7 +53,7 @@ class LLAvatarList : public LLFlatListView { LOG_CLASS(LLAvatarList); public: - typedef std::vector<LLUUID> uuid_vector_t; + typedef uuid_vec_t uuid_vector_t; struct Params : public LLInitParam::Block<Params, LLFlatListView::Params> { @@ -101,9 +101,9 @@ protected: void addNewItem(const LLUUID& id, const std::string& name, BOOL is_online, EAddPosition pos = ADD_BOTTOM); void computeDifference( - const std::vector<LLUUID>& vnew, - std::vector<LLUUID>& vadded, - std::vector<LLUUID>& vremoved); + const uuid_vec_t& vnew, + uuid_vec_t& vadded, + uuid_vec_t& vremoved); void updateLastInteractionTimes(); void onItemDoucleClicked(LLUICtrl* ctrl, S32 x, S32 y, MASK mask); diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h index cecb64add7..2db6484a30 100644 --- a/indra/newview/llavatarlistitem.h +++ b/indra/newview/llavatarlistitem.h @@ -70,7 +70,7 @@ public: class ContextMenu { public: - virtual void show(LLView* spawning_view, const std::vector<LLUUID>& selected_uuids, S32 x, S32 y) = 0; + virtual void show(LLView* spawning_view, const uuid_vec_t& selected_uuids, S32 x, S32 y) = 0; }; /** diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp index c8552de66a..4ea3c61ab2 100644 --- a/indra/newview/llcallfloater.cpp +++ b/indra/newview/llcallfloater.cpp @@ -54,7 +54,7 @@ #include "llvoicechannel.h" #include "llviewerparcelmgr.h" -static void get_voice_participants_uuids(std::vector<LLUUID>& speakers_uuids); +static void get_voice_participants_uuids(uuid_vec_t& speakers_uuids); void reshape_floater(LLCallFloater* floater, S32 delta_height); class LLNonAvatarCaller : public LLAvatarListItem @@ -213,9 +213,9 @@ void LLCallFloater::onChange() updateParticipantsVoiceState(); // Add newly joined participants. - std::vector<LLUUID> speakers_uuids; + uuid_vec_t speakers_uuids; get_voice_participants_uuids(speakers_uuids); - for (std::vector<LLUUID>::const_iterator it = speakers_uuids.begin(); it != speakers_uuids.end(); it++) + for (uuid_vec_t::const_iterator it = speakers_uuids.begin(); it != speakers_uuids.end(); it++) { mParticipants->addAvatarIDExceptAgent(*it); } @@ -469,7 +469,7 @@ void LLCallFloater::updateAgentModeratorState() mAgentPanel->childSetValue("user_text", name); } -static void get_voice_participants_uuids(std::vector<LLUUID>& speakers_uuids) +static void get_voice_participants_uuids(uuid_vec_t& speakers_uuids) { // Get a list of participants from VoiceClient LLVoiceClient::participantMap *voice_map = gVoiceClient->getParticipantList(); @@ -494,7 +494,7 @@ void LLCallFloater::initParticipantsVoiceState() it_end = items.end(); - std::vector<LLUUID> speakers_uuids; + uuid_vec_t speakers_uuids; get_voice_participants_uuids(speakers_uuids); for(; it != it_end; ++it) @@ -505,7 +505,7 @@ void LLCallFloater::initParticipantsVoiceState() LLUUID speaker_id = item->getAvatarId(); - std::vector<LLUUID>::const_iterator speaker_iter = std::find(speakers_uuids.begin(), speakers_uuids.end(), speaker_id); + uuid_vec_t::const_iterator speaker_iter = std::find(speakers_uuids.begin(), speakers_uuids.end(), speaker_id); // If an avatarID assigned to a panel is found in a speakers list // obtained from VoiceClient we assign the JOINED status to the owner @@ -534,10 +534,10 @@ void LLCallFloater::initParticipantsVoiceState() void LLCallFloater::updateParticipantsVoiceState() { - std::vector<LLUUID> speakers_list; + uuid_vec_t speakers_list; // Get a list of participants from VoiceClient - std::vector<LLUUID> speakers_uuids; + uuid_vec_t speakers_uuids; get_voice_participants_uuids(speakers_uuids); // Updating the status for each participant already in list. @@ -555,7 +555,7 @@ void LLCallFloater::updateParticipantsVoiceState() const LLUUID participant_id = item->getAvatarId(); bool found = false; - std::vector<LLUUID>::iterator speakers_iter = std::find(speakers_uuids.begin(), speakers_uuids.end(), participant_id); + uuid_vec_t::iterator speakers_iter = std::find(speakers_uuids.begin(), speakers_uuids.end(), participant_id); lldebugs << "processing speaker: " << item->getAvatarName() << ", " << item->getAvatarId() << llendl; @@ -695,7 +695,7 @@ bool LLCallFloater::validateSpeaker(const LLUUID& speaker_id) case VC_LOCAL_CHAT: { // A nearby chat speaker is considered valid it it's known to LLVoiceClient (i.e. has enabled voice). - std::vector<LLUUID> speakers; + uuid_vec_t speakers; get_voice_participants_uuids(speakers); is_valid = std::find(speakers.begin(), speakers.end(), speaker_id) != speakers.end(); } diff --git a/indra/newview/llchatbar.cpp b/indra/newview/llchatbar.cpp index b32a955038..67d5d21b2a 100644 --- a/indra/newview/llchatbar.cpp +++ b/indra/newview/llchatbar.cpp @@ -107,7 +107,7 @@ LLChatBar::LLChatBar() LLChatBar::~LLChatBar() { - LLGestureManager::instance().removeObserver(mObserver); + LLGestureMgr::instance().removeObserver(mObserver); delete mObserver; mObserver = NULL; // LLView destructor cleans up children @@ -209,8 +209,8 @@ void LLChatBar::refreshGestures() // collect list of unique gestures std::map <std::string, BOOL> unique; - LLGestureManager::item_map_t::const_iterator it; - const LLGestureManager::item_map_t& active_gestures = LLGestureManager::instance().getActiveGestures(); + LLGestureMgr::item_map_t::const_iterator it; + const LLGestureMgr::item_map_t& active_gestures = LLGestureMgr::instance().getActiveGestures(); for (it = active_gestures.begin(); it != active_gestures.end(); ++it) { LLMultiGesture* gesture = (*it).second; @@ -296,7 +296,7 @@ void LLChatBar::setGestureCombo(LLComboBox* combo) // now register observer since we have a place to put the results mObserver = new LLChatBarGestureObserver(this); - LLGestureManager::instance().addObserver(mObserver); + LLGestureMgr::instance().addObserver(mObserver); // refresh list from current active gestures refreshGestures(); @@ -377,7 +377,7 @@ void LLChatBar::sendChat( EChatType type ) if (0 == channel) { // discard returned "found" boolean - LLGestureManager::instance().triggerAndReviseString(utf8text, &utf8_revised_text); + LLGestureMgr::instance().triggerAndReviseString(utf8text, &utf8_revised_text); } else { @@ -516,7 +516,7 @@ void LLChatBar::onInputEditorKeystroke( LLLineEditor* caller, void* userdata ) std::string utf8_trigger = wstring_to_utf8str(raw_text); std::string utf8_out_str(utf8_trigger); - if (LLGestureManager::instance().matchPrefix(utf8_trigger, &utf8_out_str)) + if (LLGestureMgr::instance().matchPrefix(utf8_trigger, &utf8_out_str)) { if (self->mInputEditor) { @@ -653,7 +653,7 @@ void LLChatBar::onCommitGesture(LLUICtrl* ctrl) // substitution and logging. std::string text(trigger); std::string revised_text; - LLGestureManager::instance().triggerAndReviseString(text, &revised_text); + LLGestureMgr::instance().triggerAndReviseString(text, &revised_text); revised_text = utf8str_trim(revised_text); if (!revised_text.empty()) diff --git a/indra/newview/llchathistory.cpp b/indra/newview/llchathistory.cpp index efdfbb8d20..f5faeca126 100644 --- a/indra/newview/llchathistory.cpp +++ b/indra/newview/llchathistory.cpp @@ -646,7 +646,8 @@ void LLChatHistory::appendMessage(const LLChat& chat, const LLSD &args, const LL p.left_pad = mLeftWidgetPad; p.right_pad = mRightWidgetPad; p.view = separator; - mEditor->appendWidget(p, "\n", false); + //mEditor->appendWidget(p, "\n", false); // TODO: this is absolute minimal fix for EXT-3818 because it's late for 2.0 + mEditor->appendWidget(p, "", false); // This should be properly fixed in 2.1 mEditor->appendText("[" + chat.mTimeStr + "] ", mEditor->getText().size() != 0, style_params); diff --git a/indra/newview/lldriverparam.cpp b/indra/newview/lldriverparam.cpp index 830e975e8a..ebd767d654 100644 --- a/indra/newview/lldriverparam.cpp +++ b/indra/newview/lldriverparam.cpp @@ -118,13 +118,12 @@ void LLDriverParamInfo::toStream(std::ostream &out) out << std::endl; - LLVOAvatarSelf *avatar = gAgent.getAvatarObject(); - if(avatar) + if(isAgentAvatarValid()) { for (entry_info_list_t::iterator iter = mDrivenInfoList.begin(); iter != mDrivenInfoList.end(); iter++) { LLDrivenEntryInfo driven = *iter; - LLViewerVisualParam *param = (LLViewerVisualParam*)avatar->getVisualParam(driven.mDrivenID); + LLViewerVisualParam *param = (LLViewerVisualParam*)gAgentAvatarp->getVisualParam(driven.mDrivenID); if (param) { param->getInfo()->toStream(out); @@ -146,7 +145,7 @@ void LLDriverParamInfo::toStream(std::ostream &out) } else { - llwarns << "could not get parameter " << driven.mDrivenID << " from avatar " << avatar << " for driver parameter " << getID() << llendl; + llwarns << "could not get parameter " << driven.mDrivenID << " from avatar " << gAgentAvatarp << " for driver parameter " << getID() << llendl; } out << std::endl; } @@ -626,13 +625,13 @@ F32 LLDriverParam::getDrivenWeight(const LLDrivenEntry* driven, F32 input_weight void LLDriverParam::setDrivenWeight(LLDrivenEntry *driven, F32 driven_weight, bool upload_bake) { - LLVOAvatarSelf *avatar_self = gAgent.getAvatarObject(); - if(mWearablep && + if(isAgentAvatarValid() && + mWearablep && driven->mParam->getCrossWearable() && mWearablep->isOnTop()) { // call setWeight through LLVOAvatarSelf so other wearables can be updated with the correct values - avatar_self->setVisualParamWeight( (LLVisualParam*)driven->mParam, driven_weight, upload_bake ); + gAgentAvatarp->setVisualParamWeight( (LLVisualParam*)driven->mParam, driven_weight, upload_bake ); } else { diff --git a/indra/newview/llfloateranimpreview.cpp b/indra/newview/llfloateranimpreview.cpp index feb18fe393..434c89e8ba 100644 --- a/indra/newview/llfloateranimpreview.cpp +++ b/indra/newview/llfloateranimpreview.cpp @@ -568,7 +568,7 @@ void LLFloaterAnimPreview::onBtnPlay(void* user_data) { LLVOAvatar* avatarp = previewp->mAnimPreview->getDummyAvatar(); - if(!avatarp->isMotionActive(previewp->mMotionID)) + if (!avatarp->isMotionActive(previewp->mMotionID)) { previewp->resetMotion(); previewp->mPauseRequest = NULL; @@ -593,7 +593,7 @@ void LLFloaterAnimPreview::onBtnPause(void* user_data) { LLVOAvatar* avatarp = previewp->mAnimPreview->getDummyAvatar(); - if(avatarp->isMotionActive(previewp->mMotionID)) + if (avatarp->isMotionActive(previewp->mMotionID)) { if (!avatarp->areAnimationsPaused()) { diff --git a/indra/newview/llfloateravatarpicker.cpp b/indra/newview/llfloateravatarpicker.cpp index a0b2de85f0..2cb0cdf368 100644 --- a/indra/newview/llfloateravatarpicker.cpp +++ b/indra/newview/llfloateravatarpicker.cpp @@ -157,7 +157,7 @@ void LLFloaterAvatarPicker::onBtnFind() find(); } -static void getSelectedAvatarData(const LLScrollListCtrl* from, std::vector<std::string>& avatar_names, std::vector<LLUUID>& avatar_ids) +static void getSelectedAvatarData(const LLScrollListCtrl* from, std::vector<std::string>& avatar_names, uuid_vec_t& avatar_ids) { std::vector<LLScrollListItem*> items = from->getAllSelected(); for (std::vector<LLScrollListItem*>::iterator iter = items.begin(); iter != items.end(); ++iter) @@ -203,7 +203,7 @@ void LLFloaterAvatarPicker::onBtnSelect() if(list) { std::vector<std::string> avatar_names; - std::vector<LLUUID> avatar_ids; + uuid_vec_t avatar_ids; getSelectedAvatarData(list, avatar_names, avatar_ids); mSelectionCallback(avatar_names, avatar_ids); } @@ -247,7 +247,7 @@ void LLFloaterAvatarPicker::populateNearMe() LLScrollListCtrl* near_me_scroller = getChild<LLScrollListCtrl>("NearMe"); near_me_scroller->deleteAllItems(); - std::vector<LLUUID> avatar_ids; + uuid_vec_t avatar_ids; LLWorld::getInstance()->getAvatars(&avatar_ids, NULL, gAgent.getPositionGlobal(), gSavedSettings.getF32("NearMeRange")); for(U32 i=0; i<avatar_ids.size(); i++) { @@ -499,7 +499,7 @@ bool LLFloaterAvatarPicker::isSelectBtnEnabled() if(list) { - std::vector<LLUUID> avatar_ids; + uuid_vec_t avatar_ids; std::vector<std::string> avatar_names; getSelectedAvatarData(list, avatar_names, avatar_ids); return mOkButtonValidateSignal(avatar_ids); diff --git a/indra/newview/llfloateravatarpicker.h b/indra/newview/llfloateravatarpicker.h index e35466cec8..860f3930ef 100644 --- a/indra/newview/llfloateravatarpicker.h +++ b/indra/newview/llfloateravatarpicker.h @@ -40,11 +40,11 @@ class LLFloaterAvatarPicker : public LLFloater { public: - typedef boost::signals2::signal<bool(const std::vector<LLUUID>&), boost_boolean_combiner> validate_signal_t; + typedef boost::signals2::signal<bool(const uuid_vec_t&), boost_boolean_combiner> validate_signal_t; typedef validate_signal_t::slot_type validate_callback_t; // The callback function will be called with an avatar name and UUID. - typedef boost::function<void (const std::vector<std::string>&, const std::vector<LLUUID>&)> select_callback_t; + typedef boost::function<void (const std::vector<std::string>&, const uuid_vec_t&)> select_callback_t; // Call this to select an avatar. static LLFloaterAvatarPicker* show(select_callback_t callback, BOOL allow_multiple = FALSE, diff --git a/indra/newview/llfloatergesture.cpp b/indra/newview/llfloatergesture.cpp index 9c1ac2631d..bf03412696 100644 --- a/indra/newview/llfloatergesture.cpp +++ b/indra/newview/llfloatergesture.cpp @@ -106,7 +106,7 @@ LLFloaterGesture::LLFloaterGesture(const LLSD& key) : LLFloater(key) { mObserver = new LLFloaterGestureObserver(this); - LLGestureManager::instance().addObserver(mObserver); + LLGestureMgr::instance().addObserver(mObserver); mCommitCallbackRegistrar.add("Gesture.Action.ToogleActiveState", boost::bind(&LLFloaterGesture::onActivateBtnClick, this)); mCommitCallbackRegistrar.add("Gesture.Action.ShowPreview", boost::bind(&LLFloaterGesture::onClickEdit, this)); @@ -125,7 +125,7 @@ void LLFloaterGesture::done() // we load only gesture folder without childred. LLInventoryModel::cat_array_t* categories; LLInventoryModel::item_array_t* items; - LLInventoryFetchDescendentsObserver::folder_ref_t unloaded_folders; + uuid_vec_t unloaded_folders; LL_DEBUGS("Gesture")<< "Get subdirs of Gesture Folder...." << LL_ENDL; gInventory.getDirectDescendentsOf(mGestureFolderID, categories, items); if (categories->empty()) @@ -165,7 +165,7 @@ void LLFloaterGesture::done() // virtual LLFloaterGesture::~LLFloaterGesture() { - LLGestureManager::instance().removeObserver(mObserver); + LLGestureMgr::instance().removeObserver(mObserver); delete mObserver; mObserver = NULL; gInventory.removeObserver(this); @@ -197,7 +197,7 @@ BOOL LLFloaterGesture::postBuild() setDefaultBtn("play_btn"); mGestureFolderID = gInventory.findCategoryUUIDForType(LLFolderType::FT_GESTURE, false); - folder_ref_t folders; + uuid_vec_t folders; folders.push_back(mGestureFolderID); //perform loading Gesture directory anyway to make sure that all subdirectory are loaded too. See method done() for details. gInventory.addObserver(this); @@ -246,13 +246,13 @@ void LLFloaterGesture::refreshAll() void LLFloaterGesture::buildGestureList() { S32 scroll_pos = mGestureList->getScrollPos(); - std::vector<LLUUID> selected_items; + uuid_vec_t selected_items; getSelectedIds(selected_items); LL_DEBUGS("Gesture")<< "Rebuilding gesture list "<< LL_ENDL; mGestureList->deleteAllItems(); - LLGestureManager::item_map_t::const_iterator it; - const LLGestureManager::item_map_t& active_gestures = LLGestureManager::instance().getActiveGestures(); + LLGestureMgr::item_map_t::const_iterator it; + const LLGestureMgr::item_map_t& active_gestures = LLGestureMgr::instance().getActiveGestures(); for (it = active_gestures.begin(); it != active_gestures.end(); ++it) { addGesture(it->first,it->second, mGestureList); @@ -278,7 +278,7 @@ void LLFloaterGesture::buildGestureList() // attempt to preserve scroll position through re-builds // since we do re-build whenever something gets dirty - for(std::vector<LLUUID>::iterator it = selected_items.begin(); it != selected_items.end(); it++) + for(uuid_vec_t::iterator it = selected_items.begin(); it != selected_items.end(); it++) { mGestureList->selectByID(*it); } @@ -371,13 +371,13 @@ void LLFloaterGesture::addGesture(const LLUUID& item_id , LLMultiGesture* gestur LLScrollListItem* sl_item = list->addElement(element, ADD_BOTTOM); if(sl_item) { - LLFontGL::StyleFlags style = LLGestureManager::getInstance()->isGestureActive(item_id) ? LLFontGL::BOLD : LLFontGL::NORMAL; + LLFontGL::StyleFlags style = LLGestureMgr::getInstance()->isGestureActive(item_id) ? LLFontGL::BOLD : LLFontGL::NORMAL; // *TODO find out why ["font"]["style"] does not affect font style ((LLScrollListText*)sl_item->getColumn(0))->setFontStyle(style); } } -void LLFloaterGesture::getSelectedIds(std::vector<LLUUID>& ids) +void LLFloaterGesture::getSelectedIds(uuid_vec_t& ids) { std::vector<LLScrollListItem*> items = mGestureList->getAllSelected(); for(std::vector<LLScrollListItem*>::const_iterator it = items.begin(); it != items.end(); it++) @@ -421,17 +421,17 @@ void LLFloaterGesture::onClickPlay() if(item_id.isNull()) return; LL_DEBUGS("Gesture")<<" Trying to play gesture id: "<< item_id <<LL_ENDL; - if(!LLGestureManager::instance().isGestureActive(item_id)) + if(!LLGestureMgr::instance().isGestureActive(item_id)) { // we need to inform server about gesture activating to be consistent with LLPreviewGesture and LLGestureComboList. BOOL inform_server = TRUE; BOOL deactivate_similar = FALSE; - LLGestureManager::instance().setGestureLoadedCallback(item_id, boost::bind(&LLFloaterGesture::playGesture, this, item_id)); + LLGestureMgr::instance().setGestureLoadedCallback(item_id, boost::bind(&LLFloaterGesture::playGesture, this, item_id)); LLViewerInventoryItem *item = gInventory.getItem(item_id); llassert(item); if (item) { - LLGestureManager::instance().activateGestureWithAsset(item_id, item->getAssetUUID(), inform_server, deactivate_similar); + LLGestureMgr::instance().activateGestureWithAsset(item_id, item->getAssetUUID(), inform_server, deactivate_similar); LL_DEBUGS("Gesture")<< "Activating gesture with inventory ID: " << item_id <<LL_ENDL; } } @@ -451,13 +451,13 @@ void LLFloaterGesture::onClickNew() void LLFloaterGesture::onActivateBtnClick() { - std::vector<LLUUID> ids; + uuid_vec_t ids; getSelectedIds(ids); if(ids.empty()) return; - LLGestureManager* gm = LLGestureManager::getInstance(); - std::vector<LLUUID>::const_iterator it = ids.begin(); + LLGestureMgr* gm = LLGestureMgr::getInstance(); + uuid_vec_t::const_iterator it = ids.begin(); BOOL first_gesture_state = gm->isGestureActive(*it); BOOL is_mixed = FALSE; while( ++it != ids.end() ) @@ -468,7 +468,7 @@ void LLFloaterGesture::onActivateBtnClick() break; } } - for(std::vector<LLUUID>::const_iterator it = ids.begin(); it != ids.end(); it++) + for(uuid_vec_t::const_iterator it = ids.begin(); it != ids.end(); it++) { if(is_mixed) { @@ -494,11 +494,11 @@ void LLFloaterGesture::onCopyPasteAction(const LLSD& command) // since we select this comman inventory item had already arrived . if("copy_gesture" == command_name) { - std::vector<LLUUID> ids; + uuid_vec_t ids; getSelectedIds(ids); // make sure that clopboard is empty LLInventoryClipboard::instance().reset(); - for(std::vector<LLUUID>::iterator it = ids.begin(); it != ids.end(); it++) + for(uuid_vec_t::iterator it = ids.begin(); it != ids.end(); it++) { LLInventoryItem* item = gInventory.getItem(*it); if(item && item->getInventoryType() == LLInventoryType::IT_GESTURE) @@ -558,7 +558,7 @@ void LLFloaterGesture::onCommitList() const LLUUID& item_id = mGestureList->getCurrentID(); mSelectedID = item_id; - if (LLGestureManager::instance().isGesturePlaying(item_id)) + if (LLGestureMgr::instance().isGesturePlaying(item_id)) { childSetVisible("play_btn", false); childSetVisible("stop_btn", true); @@ -572,14 +572,14 @@ void LLFloaterGesture::onCommitList() void LLFloaterGesture::onDeleteSelected() { - std::vector<LLUUID> ids; + uuid_vec_t ids; getSelectedIds(ids); if(ids.empty()) return; const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH); - LLGestureManager* gm = LLGestureManager::getInstance(); - for(std::vector<LLUUID>::const_iterator it = ids.begin(); it != ids.end(); it++) + LLGestureMgr* gm = LLGestureMgr::getInstance(); + for(uuid_vec_t::const_iterator it = ids.begin(); it != ids.end(); it++) { const LLUUID& selected_item = *it; LLInventoryItem* inv_item = gInventory.getItem(selected_item); @@ -610,10 +610,10 @@ void LLFloaterGesture::onDeleteSelected() void LLFloaterGesture::addToCurrentOutFit() { - std::vector<LLUUID> ids; + uuid_vec_t ids; getSelectedIds(ids); - LLAppearanceManager* am = LLAppearanceManager::getInstance(); - for(std::vector<LLUUID>::const_iterator it = ids.begin(); it != ids.end(); it++) + LLAppearanceMgr* am = LLAppearanceMgr::getInstance(); + for(uuid_vec_t::const_iterator it = ids.begin(); it != ids.end(); it++) { am->addCOFItemLink(*it); } @@ -623,12 +623,12 @@ void LLFloaterGesture::playGesture(LLUUID item_id) { LL_DEBUGS("Gesture")<<"Playing gesture "<< item_id<<LL_ENDL; - if (LLGestureManager::instance().isGesturePlaying(item_id)) + if (LLGestureMgr::instance().isGesturePlaying(item_id)) { - LLGestureManager::instance().stopGesture(item_id); + LLGestureMgr::instance().stopGesture(item_id); } else { - LLGestureManager::instance().playGesture(item_id); + LLGestureMgr::instance().playGesture(item_id); } } diff --git a/indra/newview/llfloatergesture.h b/indra/newview/llfloatergesture.h index 629d77b949..1676542c77 100644 --- a/indra/newview/llfloatergesture.h +++ b/indra/newview/llfloatergesture.h @@ -85,7 +85,7 @@ private: * Therefore we have to copy these items to avoid viewer crash. * @see LLFloaterGesture::onActivateBtnClick */ - void getSelectedIds(std::vector<LLUUID>& ids); + void getSelectedIds(uuid_vec_t& ids); bool isActionEnabled(const LLSD& command); /** * @brief Activation rules: diff --git a/indra/newview/llfloatergodtools.cpp b/indra/newview/llfloatergodtools.cpp index eb56f387cd..fbd516ba7a 100644 --- a/indra/newview/llfloatergodtools.cpp +++ b/indra/newview/llfloatergodtools.cpp @@ -1191,7 +1191,7 @@ void LLPanelObjectTools::onClickSetBySelection(void* data) panelp->childSetValue("target_avatar_name", name); } -void LLPanelObjectTools::callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids) +void LLPanelObjectTools::callbackAvatarID(const std::vector<std::string>& names, const uuid_vec_t& ids) { if (ids.empty() || names.empty()) return; mTargetAvatar = ids[0]; diff --git a/indra/newview/llfloatergodtools.h b/indra/newview/llfloatergodtools.h index ef5ce02749..4e97a1058e 100644 --- a/indra/newview/llfloatergodtools.h +++ b/indra/newview/llfloatergodtools.h @@ -234,7 +234,7 @@ public: void onChangeAnything(); void onApplyChanges(); void onClickSet(); - void callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids); + void callbackAvatarID(const std::vector<std::string>& names, const uuid_vec_t& ids); void onClickDeletePublicOwnedBy(); void onClickDeleteAllScriptedOwnedBy(); void onClickDeleteAllOwnedBy(); diff --git a/indra/newview/llfloatergroupinvite.cpp b/indra/newview/llfloatergroupinvite.cpp index bf484c6343..5d1864b4c8 100644 --- a/indra/newview/llfloatergroupinvite.cpp +++ b/indra/newview/llfloatergroupinvite.cpp @@ -112,7 +112,7 @@ LLFloaterGroupInvite::~LLFloaterGroupInvite() } // static -void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, std::vector<LLUUID> *agent_ids) +void LLFloaterGroupInvite::showForGroup(const LLUUID& group_id, uuid_vec_t *agent_ids) { const LLFloater::Params& floater_params = LLFloater::getDefaultParams(); S32 floater_header_size = floater_params.header_height; diff --git a/indra/newview/llfloatergroupinvite.h b/indra/newview/llfloatergroupinvite.h index b3f5d75ac1..68943724df 100644 --- a/indra/newview/llfloatergroupinvite.h +++ b/indra/newview/llfloatergroupinvite.h @@ -43,7 +43,7 @@ class LLFloaterGroupInvite public: virtual ~LLFloaterGroupInvite(); - static void showForGroup(const LLUUID &group_id, std::vector<LLUUID> *agent_ids = NULL); + static void showForGroup(const LLUUID &group_id, uuid_vec_t *agent_ids = NULL); protected: LLFloaterGroupInvite(const LLUUID& group_id = LLUUID::null); diff --git a/indra/newview/llfloaterlagmeter.cpp b/indra/newview/llfloaterlagmeter.cpp index 85186cee6b..100cbdb217 100644 --- a/indra/newview/llfloaterlagmeter.cpp +++ b/indra/newview/llfloaterlagmeter.cpp @@ -206,7 +206,7 @@ void LLFloaterLagMeter::determineNetwork() // *FIXME: We can't blame a large ping time on anything in // particular if the frame rate is low, because a low frame - // rate is a sure recipe for crappy ping times right now until + // rate is a sure recipe for bad ping times right now until // the network handlers are de-synched from the rendering. F32 client_frame_time_ms = 1000.0f * LLViewerStats::getInstance()->mFPSStat.getMeanDuration(); diff --git a/indra/newview/llfloaterland.cpp b/indra/newview/llfloaterland.cpp index 65003d9b5c..6467ee13b0 100644 --- a/indra/newview/llfloaterland.cpp +++ b/indra/newview/llfloaterland.cpp @@ -2774,7 +2774,7 @@ void LLPanelLandAccess::onClickAddAccess() gFloaterView->getParentFloater(this)->addDependentFloater(LLFloaterAvatarPicker::show(boost::bind(&LLPanelLandAccess::callbackAvatarCBAccess, this, _1,_2)) ); } -void LLPanelLandAccess::callbackAvatarCBAccess(const std::vector<std::string>& names, const std::vector<LLUUID>& ids) +void LLPanelLandAccess::callbackAvatarCBAccess(const std::vector<std::string>& names, const uuid_vec_t& ids) { if (!names.empty() && !ids.empty()) { @@ -2819,7 +2819,7 @@ void LLPanelLandAccess::onClickAddBanned() } // static -void LLPanelLandAccess::callbackAvatarCBBanned(const std::vector<std::string>& names, const std::vector<LLUUID>& ids) +void LLPanelLandAccess::callbackAvatarCBBanned(const std::vector<std::string>& names, const uuid_vec_t& ids) { if (!names.empty() && !ids.empty()) { diff --git a/indra/newview/llfloaterland.h b/indra/newview/llfloaterland.h index a4785e8f5b..fe80766a74 100644 --- a/indra/newview/llfloaterland.h +++ b/indra/newview/llfloaterland.h @@ -167,7 +167,7 @@ public: static void onClickSet(void* data); static void onClickClear(void* data); static void onClickShow(void* data); - static void callbackAvatarPick(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* data); + static void callbackAvatarPick(const std::vector<std::string>& names, const uuid_vec_t& ids, void* data); static void finalizeAvatarPick(void* data); static void callbackHighlightTransferable(S32 option, void* userdata); static void onClickStartAuction(void*); @@ -374,8 +374,8 @@ public: void onClickAddAccess(); void onClickAddBanned(); - void callbackAvatarCBBanned(const std::vector<std::string>& names, const std::vector<LLUUID>& ids); - void callbackAvatarCBAccess(const std::vector<std::string>& names, const std::vector<LLUUID>& ids); + void callbackAvatarCBBanned(const std::vector<std::string>& names, const uuid_vec_t& ids); + void callbackAvatarCBAccess(const std::vector<std::string>& names, const uuid_vec_t& ids); protected: LLNameListCtrl* mListAccess; diff --git a/indra/newview/llfloaterregioninfo.cpp b/indra/newview/llfloaterregioninfo.cpp index d54736e942..3758cbe74f 100644 --- a/indra/newview/llfloaterregioninfo.cpp +++ b/indra/newview/llfloaterregioninfo.cpp @@ -610,7 +610,7 @@ void LLPanelRegionGeneralInfo::onClickKick() parent_floater->addDependentFloater(child_floater); } -void LLPanelRegionGeneralInfo::onKickCommit(const std::vector<std::string>& names, const std::vector<LLUUID>& ids) +void LLPanelRegionGeneralInfo::onKickCommit(const std::vector<std::string>& names, const uuid_vec_t& ids) { if (names.empty() || ids.empty()) return; if(ids[0].notNull()) @@ -848,7 +848,7 @@ void LLPanelRegionDebugInfo::onClickChooseAvatar() } -void LLPanelRegionDebugInfo::callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids) +void LLPanelRegionDebugInfo::callbackAvatarID(const std::vector<std::string>& names, const uuid_vec_t& ids) { if (ids.empty() || names.empty()) return; mTargetAvatar = ids[0]; @@ -1531,7 +1531,7 @@ void LLPanelEstateInfo::onClickKickUser() parent_floater->addDependentFloater(child_floater); } -void LLPanelEstateInfo::onKickUserCommit(const std::vector<std::string>& names, const std::vector<LLUUID>& ids) +void LLPanelEstateInfo::onKickUserCommit(const std::vector<std::string>& names, const uuid_vec_t& ids) { if (names.empty() || ids.empty()) return; @@ -1616,7 +1616,6 @@ bool LLPanelEstateInfo::isLindenEstate() return (estate_id <= ESTATE_LAST_LINDEN); } -typedef std::vector<LLUUID> AgentOrGroupIDsVector; struct LLEstateAccessChangeInfo { LLEstateAccessChangeInfo(const LLSD& sd) @@ -1637,7 +1636,7 @@ struct LLEstateAccessChangeInfo LLSD sd; sd["name"] = mDialogName; sd["operation"] = (S32)mOperationFlag; - for (AgentOrGroupIDsVector::const_iterator it = mAgentOrGroupIDs.begin(); + for (uuid_vec_t::const_iterator it = mAgentOrGroupIDs.begin(); it != mAgentOrGroupIDs.end(); ++it) { @@ -1648,7 +1647,7 @@ struct LLEstateAccessChangeInfo U32 mOperationFlag; // ESTATE_ACCESS_BANNED_AGENT_ADD, _REMOVE, etc. std::string mDialogName; - AgentOrGroupIDsVector mAgentOrGroupIDs; // List of agent IDs to apply to this change + uuid_vec_t mAgentOrGroupIDs; // List of agent IDs to apply to this change }; // Special case callback for groups, since it has different callback format than names @@ -1716,7 +1715,7 @@ bool LLPanelEstateInfo::accessAddCore2(const LLSD& notification, const LLSD& res } // static -void LLPanelEstateInfo::accessAddCore3(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* data) +void LLPanelEstateInfo::accessAddCore3(const std::vector<std::string>& names, const uuid_vec_t& ids, void* data) { LLEstateAccessChangeInfo* change_info = (LLEstateAccessChangeInfo*)data; if (!change_info) return; diff --git a/indra/newview/llfloaterregioninfo.h b/indra/newview/llfloaterregioninfo.h index 8d315bdb78..482ebb3303 100644 --- a/indra/newview/llfloaterregioninfo.h +++ b/indra/newview/llfloaterregioninfo.h @@ -168,7 +168,7 @@ public: protected: virtual BOOL sendUpdate(); void onClickKick(); - void onKickCommit(const std::vector<std::string>& names, const std::vector<LLUUID>& ids); + void onKickCommit(const std::vector<std::string>& names, const uuid_vec_t& ids); static void onClickKickAll(void* userdata); bool onKickAllCommit(const LLSD& notification, const LLSD& response); static void onClickMessage(void* userdata); @@ -193,7 +193,7 @@ protected: virtual BOOL sendUpdate(); void onClickChooseAvatar(); - void callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids); + void callbackAvatarID(const std::vector<std::string>& names, const uuid_vec_t& ids); static void onClickReturn(void *); bool callbackReturn(const LLSD& notification, const LLSD& response); static void onClickTopColliders(void*); @@ -284,7 +284,7 @@ public: // Core methods for all above add/remove button clicks static void accessAddCore(U32 operation_flag, const std::string& dialog_name); static bool accessAddCore2(const LLSD& notification, const LLSD& response); - static void accessAddCore3(const std::vector<std::string>& names, const std::vector<LLUUID>& ids, void* data); + static void accessAddCore3(const std::vector<std::string>& names, const uuid_vec_t& ids, void* data); static void accessRemoveCore(U32 operation_flag, const std::string& dialog_name, const std::string& list_ctrl_name); static bool accessRemoveCore2(const LLSD& notification, const LLSD& response); @@ -296,7 +296,7 @@ public: // Send the actual EstateOwnerRequest "estateaccessdelta" message static void sendEstateAccessDelta(U32 flags, const LLUUID& agent_id); - void onKickUserCommit(const std::vector<std::string>& names, const std::vector<LLUUID>& ids); + void onKickUserCommit(const std::vector<std::string>& names, const uuid_vec_t& ids); static void onClickMessageEstate(void* data); bool onMessageCommit(const LLSD& notification, const LLSD& response); diff --git a/indra/newview/llfloaterreporter.cpp b/indra/newview/llfloaterreporter.cpp index 42a7eeff26..b42b34835d 100644 --- a/indra/newview/llfloaterreporter.cpp +++ b/indra/newview/llfloaterreporter.cpp @@ -308,7 +308,7 @@ void LLFloaterReporter::onClickSelectAbuser() gFloaterView->getParentFloater(this)->addDependentFloater(LLFloaterAvatarPicker::show(boost::bind(&LLFloaterReporter::callbackAvatarID, this, _1, _2), FALSE, TRUE )); } -void LLFloaterReporter::callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids) +void LLFloaterReporter::callbackAvatarID(const std::vector<std::string>& names, const uuid_vec_t& ids) { if (ids.empty() || names.empty()) return; diff --git a/indra/newview/llfloaterreporter.h b/indra/newview/llfloaterreporter.h index 7c6473f975..23784b7650 100644 --- a/indra/newview/llfloaterreporter.h +++ b/indra/newview/llfloaterreporter.h @@ -123,7 +123,7 @@ private: void setPosBox(const LLVector3d &pos); void enableControls(BOOL own_avatar); void getObjectInfo(const LLUUID& object_id); - void callbackAvatarID(const std::vector<std::string>& names, const std::vector<LLUUID>& ids); + void callbackAvatarID(const std::vector<std::string>& names, const uuid_vec_t& ids); void setFromAvatar(const LLUUID& avatar_id, const std::string& avatar_name = LLStringUtil::null); private: diff --git a/indra/newview/llfloaterscriptlimits.cpp b/indra/newview/llfloaterscriptlimits.cpp index daba3d8460..4792d761d8 100644 --- a/indra/newview/llfloaterscriptlimits.cpp +++ b/indra/newview/llfloaterscriptlimits.cpp @@ -644,7 +644,7 @@ void LLPanelScriptLimitsRegionMemory::setRegionDetails(LLSD content) std::string msg_parcels = LLTrans::getString("ScriptLimitsParcelsOwned", args_parcels); childSetValue("parcels_listed", LLSD(msg_parcels)); - std::vector<LLUUID> names_requested; + uuid_vec_t names_requested; // This makes the assumption that all objects will have the same set // of attributes, ie they will all have, or none will have locations diff --git a/indra/newview/llfloatersellland.cpp b/indra/newview/llfloatersellland.cpp index eae6121e79..980b456497 100644 --- a/indra/newview/llfloatersellland.cpp +++ b/indra/newview/llfloatersellland.cpp @@ -96,7 +96,7 @@ private: static void doShowObjects(void *userdata); static bool callbackHighlightTransferable(const LLSD& notification, const LLSD& response); - void callbackAvatarPick(const std::vector<std::string>& names, const std::vector<LLUUID>& ids); + void callbackAvatarPick(const std::vector<std::string>& names, const uuid_vec_t& ids); public: virtual BOOL postBuild(); @@ -391,7 +391,7 @@ void LLFloaterSellLandUI::doSelectAgent() addDependentFloater(LLFloaterAvatarPicker::show(boost::bind(&LLFloaterSellLandUI::callbackAvatarPick, this, _1, _2), FALSE, TRUE)); } -void LLFloaterSellLandUI::callbackAvatarPick(const std::vector<std::string>& names, const std::vector<LLUUID>& ids) +void LLFloaterSellLandUI::callbackAvatarPick(const std::vector<std::string>& names, const uuid_vec_t& ids) { LLParcel* parcel = mParcelSelection->getParcel(); diff --git a/indra/newview/llfloatertopobjects.cpp b/indra/newview/llfloatertopobjects.cpp index 8ab050beaa..84ea353dab 100644 --- a/indra/newview/llfloatertopobjects.cpp +++ b/indra/newview/llfloatertopobjects.cpp @@ -315,7 +315,7 @@ void LLFloaterTopObjects::doToObjects(int action, bool all) LLCtrlListInterface *list = childGetListInterface("objects_list"); if (!list || list->getItemCount() == 0) return; - std::vector<LLUUID>::iterator id_itor; + uuid_vec_t::iterator id_itor; bool start_message = true; diff --git a/indra/newview/llfloatertopobjects.h b/indra/newview/llfloatertopobjects.h index ee3c5d3cce..8fb89a3cc5 100644 --- a/indra/newview/llfloatertopobjects.h +++ b/indra/newview/llfloatertopobjects.h @@ -89,7 +89,7 @@ private: std::string mMethod; LLSD mObjectListData; - std::vector<LLUUID> mObjectListIDs; + uuid_vec_t mObjectListIDs; U32 mCurrentMode; U32 mFlags; diff --git a/indra/newview/llfolderview.cpp b/indra/newview/llfolderview.cpp index f74d912842..149bbe805d 100644 --- a/indra/newview/llfolderview.cpp +++ b/indra/newview/llfolderview.cpp @@ -865,7 +865,7 @@ BOOL LLFolderView::getSelectionList(std::set<LLUUID> &selection) const BOOL LLFolderView::startDrag(LLToolDragAndDrop::ESource source) { std::vector<EDragAndDropType> types; - std::vector<LLUUID> cargo_ids; + uuid_vec_t cargo_ids; selected_items_t::iterator item_it; BOOL can_drag = TRUE; if (!mSelectedItems.empty()) diff --git a/indra/newview/llfriendcard.cpp b/indra/newview/llfriendcard.cpp index 18f81fe506..1a06bef6cb 100644 --- a/indra/newview/llfriendcard.cpp +++ b/indra/newview/llfriendcard.cpp @@ -322,7 +322,7 @@ void LLFriendCardsManager::collectFriendsLists(folderid_buddies_map_t& folderBud if (NULL == items) continue; - std::vector<LLUUID> buddyUUIDs; + uuid_vec_t buddyUUIDs; for (itBuddy = items->begin(); itBuddy != items->end(); ++itBuddy) { buddyUUIDs.push_back((*itBuddy)->getCreatorUUID()); @@ -409,7 +409,7 @@ void LLFriendCardsManager::fetchAndCheckFolderDescendents(const LLUUID& folder_i // This instance will be deleted in LLInitialFriendCardsFetch::done(). LLInitialFriendCardsFetch* fetch = new LLInitialFriendCardsFetch(cb); - LLInventoryFetchDescendentsObserver::folder_ref_t folders; + uuid_vec_t folders; folders.push_back(folder_id); fetch->fetchDescendents(folders); diff --git a/indra/newview/llfriendcard.h b/indra/newview/llfriendcard.h index 1cda52c1d7..638a1eca84 100644 --- a/indra/newview/llfriendcard.h +++ b/indra/newview/llfriendcard.h @@ -49,7 +49,7 @@ class LLFriendCardsManager friend class CreateFriendCardCallback; public: - typedef std::map<LLUUID, std::vector<LLUUID> > folderid_buddies_map_t; + typedef std::map<LLUUID, uuid_vec_t > folderid_buddies_map_t; // LLFriendObserver implementation void changed(U32 mask) diff --git a/indra/newview/llgesturemgr.cpp b/indra/newview/llgesturemgr.cpp index 0ba7bdf613..fbacbd704f 100644 --- a/indra/newview/llgesturemgr.cpp +++ b/indra/newview/llgesturemgr.cpp @@ -67,7 +67,7 @@ static const LLUUID& get_linked_uuid(const LLUUID& item_id); // Lightweight constructor. // init() does the heavy lifting. -LLGestureManager::LLGestureManager() +LLGestureMgr::LLGestureMgr() : mValid(FALSE), mPlaying(), mActive(), @@ -79,7 +79,7 @@ LLGestureManager::LLGestureManager() // We own the data for gestures, so clean them up. -LLGestureManager::~LLGestureManager() +LLGestureMgr::~LLGestureMgr() { item_map_t::iterator it; for (it = mActive.begin(); it != mActive.end(); ++it) @@ -93,12 +93,12 @@ LLGestureManager::~LLGestureManager() } -void LLGestureManager::init() +void LLGestureMgr::init() { // TODO } -void LLGestureManager::changed(U32 mask) +void LLGestureMgr::changed(U32 mask) { LLInventoryFetchObserver::changed(mask); @@ -136,7 +136,7 @@ void LLGestureManager::changed(U32 mask) // Use this version when you have the item_id but not the asset_id, // and you KNOW the inventory is loaded. -void LLGestureManager::activateGesture(const LLUUID& item_id) +void LLGestureMgr::activateGesture(const LLUUID& item_id) { LLViewerInventoryItem* item = gInventory.getItem(item_id); if (!item) return; @@ -152,7 +152,7 @@ void LLGestureManager::activateGesture(const LLUUID& item_id) } -void LLGestureManager::activateGestures(LLViewerInventoryItem::item_array_t& items) +void LLGestureMgr::activateGestures(LLViewerInventoryItem::item_array_t& items) { // Load up the assets S32 count = 0; @@ -248,7 +248,7 @@ struct LLLoadInfo /** * It will load a gesture from remote storage */ -void LLGestureManager::activateGestureWithAsset(const LLUUID& item_id, +void LLGestureMgr::activateGestureWithAsset(const LLUUID& item_id, const LLUUID& asset_id, BOOL inform_server, BOOL deactivate_similar) @@ -257,7 +257,7 @@ void LLGestureManager::activateGestureWithAsset(const LLUUID& item_id, if( !gAssetStorage ) { - llwarns << "LLGestureManager::activateGestureWithAsset without valid gAssetStorage" << llendl; + llwarns << "LLGestureMgr::activateGestureWithAsset without valid gAssetStorage" << llendl; return; } // If gesture is already active, nothing to do. @@ -299,7 +299,7 @@ void LLGestureManager::activateGestureWithAsset(const LLUUID& item_id, } -void LLGestureManager::deactivateGesture(const LLUUID& item_id) +void LLGestureMgr::deactivateGesture(const LLUUID& item_id) { const LLUUID& base_item_id = get_linked_uuid(item_id); item_map_t::iterator it = mActive.find(base_item_id); @@ -338,16 +338,16 @@ void LLGestureManager::deactivateGesture(const LLUUID& item_id) gAgent.sendReliableMessage(); - LLAppearanceManager::instance().removeCOFItemLinks(base_item_id, false); + LLAppearanceMgr::instance().removeCOFItemLinks(base_item_id, false); notifyObservers(); } -void LLGestureManager::deactivateSimilarGestures(LLMultiGesture* in, const LLUUID& in_item_id) +void LLGestureMgr::deactivateSimilarGestures(LLMultiGesture* in, const LLUUID& in_item_id) { const LLUUID& base_in_item_id = get_linked_uuid(in_item_id); - std::vector<LLUUID> gest_item_ids; + uuid_vec_t gest_item_ids; // Deactivate all gestures that match item_map_t::iterator it; @@ -386,7 +386,7 @@ void LLGestureManager::deactivateSimilarGestures(LLMultiGesture* in, const LLUUI // Inform database of the change LLMessageSystem* msg = gMessageSystem; BOOL start_message = TRUE; - std::vector<LLUUID>::const_iterator vit = gest_item_ids.begin(); + uuid_vec_t::const_iterator vit = gest_item_ids.begin(); while (vit != gest_item_ids.end()) { if (start_message) @@ -431,7 +431,7 @@ void LLGestureManager::deactivateSimilarGestures(LLMultiGesture* in, const LLUUI } -BOOL LLGestureManager::isGestureActive(const LLUUID& item_id) +BOOL LLGestureMgr::isGestureActive(const LLUUID& item_id) { const LLUUID& base_item_id = get_linked_uuid(item_id); item_map_t::iterator it = mActive.find(base_item_id); @@ -439,7 +439,7 @@ BOOL LLGestureManager::isGestureActive(const LLUUID& item_id) } -BOOL LLGestureManager::isGesturePlaying(const LLUUID& item_id) +BOOL LLGestureMgr::isGesturePlaying(const LLUUID& item_id) { const LLUUID& base_item_id = get_linked_uuid(item_id); @@ -452,7 +452,7 @@ BOOL LLGestureManager::isGesturePlaying(const LLUUID& item_id) return gesture->mPlaying; } -BOOL LLGestureManager::isGesturePlaying(LLMultiGesture* gesture) +BOOL LLGestureMgr::isGesturePlaying(LLMultiGesture* gesture) { if(!gesture) { @@ -462,7 +462,7 @@ BOOL LLGestureManager::isGesturePlaying(LLMultiGesture* gesture) return gesture->mPlaying; } -void LLGestureManager::replaceGesture(const LLUUID& item_id, LLMultiGesture* new_gesture, const LLUUID& asset_id) +void LLGestureMgr::replaceGesture(const LLUUID& item_id, LLMultiGesture* new_gesture, const LLUUID& asset_id) { const LLUUID& base_item_id = get_linked_uuid(item_id); @@ -504,11 +504,11 @@ void LLGestureManager::replaceGesture(const LLUUID& item_id, LLMultiGesture* new notifyObservers(); } -void LLGestureManager::replaceGesture(const LLUUID& item_id, const LLUUID& new_asset_id) +void LLGestureMgr::replaceGesture(const LLUUID& item_id, const LLUUID& new_asset_id) { const LLUUID& base_item_id = get_linked_uuid(item_id); - item_map_t::iterator it = LLGestureManager::instance().mActive.find(base_item_id); + item_map_t::iterator it = LLGestureMgr::instance().mActive.find(base_item_id); if (it == mActive.end()) { llwarns << "replaceGesture for inactive gesture " << base_item_id << llendl; @@ -517,10 +517,10 @@ void LLGestureManager::replaceGesture(const LLUUID& item_id, const LLUUID& new_a // mActive owns this gesture pointer, so clean up memory. LLMultiGesture* gesture = (*it).second; - LLGestureManager::instance().replaceGesture(base_item_id, gesture, new_asset_id); + LLGestureMgr::instance().replaceGesture(base_item_id, gesture, new_asset_id); } -void LLGestureManager::playGesture(LLMultiGesture* gesture) +void LLGestureMgr::playGesture(LLMultiGesture* gesture) { if (!gesture) return; @@ -539,7 +539,7 @@ void LLGestureManager::playGesture(LLMultiGesture* gesture) // Convenience function that looks up the item_id for you. -void LLGestureManager::playGesture(const LLUUID& item_id) +void LLGestureMgr::playGesture(const LLUUID& item_id) { const LLUUID& base_item_id = get_linked_uuid(item_id); @@ -556,7 +556,7 @@ void LLGestureManager::playGesture(const LLUUID& item_id) // Iterates through space delimited tokens in string, triggering any gestures found. // Generates a revised string that has the found tokens replaced by their replacement strings // and (as a minor side effect) has multiple spaces in a row replaced by single spaces. -BOOL LLGestureManager::triggerAndReviseString(const std::string &utf8str, std::string* revised_string) +BOOL LLGestureMgr::triggerAndReviseString(const std::string &utf8str, std::string* revised_string) { std::string tokenized = utf8str; @@ -649,7 +649,7 @@ BOOL LLGestureManager::triggerAndReviseString(const std::string &utf8str, std::s } -BOOL LLGestureManager::triggerGesture(KEY key, MASK mask) +BOOL LLGestureMgr::triggerGesture(KEY key, MASK mask) { std::vector <LLMultiGesture *> matching; item_map_t::iterator it; @@ -683,7 +683,7 @@ BOOL LLGestureManager::triggerGesture(KEY key, MASK mask) } -S32 LLGestureManager::getPlayingCount() const +S32 LLGestureMgr::getPlayingCount() const { return mPlaying.size(); } @@ -697,7 +697,7 @@ struct IsGesturePlaying : public std::unary_function<LLMultiGesture*, bool> } }; -void LLGestureManager::update() +void LLGestureMgr::update() { S32 i; for (i = 0; i < (S32)mPlaying.size(); ++i) @@ -740,14 +740,13 @@ void LLGestureManager::update() // Run all steps until you're either done or hit a wait. -void LLGestureManager::stepGesture(LLMultiGesture* gesture) +void LLGestureMgr::stepGesture(LLMultiGesture* gesture) { if (!gesture) { return; } - LLVOAvatar* avatar = gAgent.getAvatarObject(); - if (!avatar) return; + if (!isAgentAvatarValid()) return; // Of the ones that started playing, have any stopped? @@ -758,8 +757,8 @@ void LLGestureManager::stepGesture(LLMultiGesture* gesture) { // look in signaled animations (simulator's view of what is // currently playing. - LLVOAvatar::AnimIterator play_it = avatar->mSignaledAnimations.find(*gest_it); - if (play_it != avatar->mSignaledAnimations.end()) + LLVOAvatar::AnimIterator play_it = gAgentAvatarp->mSignaledAnimations.find(*gest_it); + if (play_it != gAgentAvatarp->mSignaledAnimations.end()) { ++gest_it; } @@ -777,8 +776,8 @@ void LLGestureManager::stepGesture(LLMultiGesture* gesture) gest_it != gesture->mRequestedAnimIDs.end(); ) { - LLVOAvatar::AnimIterator play_it = avatar->mSignaledAnimations.find(*gest_it); - if (play_it != avatar->mSignaledAnimations.end()) + LLVOAvatar::AnimIterator play_it = gAgentAvatarp->mSignaledAnimations.find(*gest_it); + if (play_it != gAgentAvatarp->mSignaledAnimations.end()) { // Hooray, this animation has started playing! // Copy into playing. @@ -888,7 +887,7 @@ void LLGestureManager::stepGesture(LLMultiGesture* gesture) } -void LLGestureManager::runStep(LLMultiGesture* gesture, LLGestureStep* step) +void LLGestureMgr::runStep(LLMultiGesture* gesture, LLGestureStep* step) { switch(step->getType()) { @@ -975,7 +974,7 @@ void LLGestureManager::runStep(LLMultiGesture* gesture, LLGestureStep* step) // static -void LLGestureManager::onLoadComplete(LLVFS *vfs, +void LLGestureMgr::onLoadComplete(LLVFS *vfs, const LLUUID& asset_uuid, LLAssetType::EType type, void* user_data, S32 status, LLExtStat ext_status) @@ -988,7 +987,7 @@ void LLGestureManager::onLoadComplete(LLVFS *vfs, delete info; info = NULL; - LLGestureManager& self = LLGestureManager::instance(); + LLGestureMgr& self = LLGestureMgr::instance(); self.mLoadingCount--; if (0 == status) @@ -1094,12 +1093,12 @@ void LLGestureManager::onLoadComplete(LLVFS *vfs, llwarns << "Problem loading gesture: " << status << llendl; - LLGestureManager::instance().mActive.erase(item_id); + LLGestureMgr::instance().mActive.erase(item_id); } } -void LLGestureManager::stopGesture(LLMultiGesture* gesture) +void LLGestureMgr::stopGesture(LLMultiGesture* gesture) { if (!gesture) return; @@ -1139,7 +1138,7 @@ void LLGestureManager::stopGesture(LLMultiGesture* gesture) } -void LLGestureManager::stopGesture(const LLUUID& item_id) +void LLGestureMgr::stopGesture(const LLUUID& item_id) { const LLUUID& base_item_id = get_linked_uuid(item_id); @@ -1153,12 +1152,12 @@ void LLGestureManager::stopGesture(const LLUUID& item_id) } -void LLGestureManager::addObserver(LLGestureManagerObserver* observer) +void LLGestureMgr::addObserver(LLGestureManagerObserver* observer) { mObservers.push_back(observer); } -void LLGestureManager::removeObserver(LLGestureManagerObserver* observer) +void LLGestureMgr::removeObserver(LLGestureManagerObserver* observer) { std::vector<LLGestureManagerObserver*>::iterator it; it = std::find(mObservers.begin(), mObservers.end(), observer); @@ -1171,9 +1170,9 @@ void LLGestureManager::removeObserver(LLGestureManagerObserver* observer) // Call this method when it's time to update everyone on a new state. // Copy the list because an observer could respond by removing itself // from the list. -void LLGestureManager::notifyObservers() +void LLGestureMgr::notifyObservers() { - lldebugs << "LLGestureManager::notifyObservers" << llendl; + lldebugs << "LLGestureMgr::notifyObservers" << llendl; std::vector<LLGestureManagerObserver*> observers = mObservers; @@ -1185,7 +1184,7 @@ void LLGestureManager::notifyObservers() } } -BOOL LLGestureManager::matchPrefix(const std::string& in_str, std::string* out_str) +BOOL LLGestureMgr::matchPrefix(const std::string& in_str, std::string* out_str) { S32 in_len = in_str.length(); @@ -1216,7 +1215,7 @@ BOOL LLGestureManager::matchPrefix(const std::string& in_str, std::string* out_s } -void LLGestureManager::getItemIDs(std::vector<LLUUID>* ids) +void LLGestureMgr::getItemIDs(uuid_vec_t* ids) { item_map_t::const_iterator it; for (it = mActive.begin(); it != mActive.end(); ++it) @@ -1225,7 +1224,7 @@ void LLGestureManager::getItemIDs(std::vector<LLUUID>* ids) } } -void LLGestureManager::done() +void LLGestureMgr::done() { bool notify = false; for(item_map_t::iterator it = mActive.begin(); it != mActive.end(); ++it) diff --git a/indra/newview/llgesturemgr.h b/indra/newview/llgesturemgr.h index 3dd184ddc7..081ca983a9 100644 --- a/indra/newview/llgesturemgr.h +++ b/indra/newview/llgesturemgr.h @@ -54,7 +54,7 @@ public: virtual void changed() = 0; }; -class LLGestureManager : public LLSingleton<LLGestureManager>, public LLInventoryFetchObserver +class LLGestureMgr : public LLSingleton<LLGestureMgr>, public LLInventoryFetchObserver { public: @@ -63,8 +63,8 @@ public: typedef std::map<LLUUID, LLMultiGesture*> item_map_t; typedef std::map<LLUUID, gesture_loaded_callback_t> callback_map_t; - LLGestureManager(); - ~LLGestureManager(); + LLGestureMgr(); + ~LLGestureMgr(); void init(); @@ -146,7 +146,7 @@ public: BOOL matchPrefix(const std::string& in_str, std::string* out_str); // Copy item ids into the vector - void getItemIDs(std::vector<LLUUID>* ids); + void getItemIDs(uuid_vec_t* ids); protected: // Handle the processing of a single gesture diff --git a/indra/newview/llgroupmgr.cpp b/indra/newview/llgroupmgr.cpp index 7f93a357de..996553ccf7 100644 --- a/indra/newview/llgroupmgr.cpp +++ b/indra/newview/llgroupmgr.cpp @@ -160,7 +160,7 @@ LLGroupRoleData::~LLGroupRoleData() { } -S32 LLGroupRoleData::getMembersInRole(std::vector<LLUUID> members, +S32 LLGroupRoleData::getMembersInRole(uuid_vec_t members, BOOL needs_sort) { if (mRoleID.isNull()) @@ -184,8 +184,8 @@ S32 LLGroupRoleData::getMembersInRole(std::vector<LLUUID> members, // Return the number of members in the intersection. S32 max_size = llmin( members.size(), mMemberIDs.size() ); - std::vector<LLUUID> in_role( max_size ); - std::vector<LLUUID>::iterator in_role_end; + uuid_vec_t in_role( max_size ); + uuid_vec_t::iterator in_role_end; in_role_end = std::set_intersection(mMemberIDs.begin(), mMemberIDs.end(), members.begin(), members.end(), in_role.begin()); @@ -200,7 +200,7 @@ void LLGroupRoleData::addMember(const LLUUID& member) bool LLGroupRoleData::removeMember(const LLUUID& member) { - std::vector<LLUUID>::iterator it = std::find(mMemberIDs.begin(),mMemberIDs.end(),member); + uuid_vec_t::iterator it = std::find(mMemberIDs.begin(),mMemberIDs.end(),member); if (it != mMemberIDs.end()) { @@ -1736,7 +1736,7 @@ void LLGroupMgr::sendGroupMemberInvites(const LLUUID& group_id, std::map<LLUUID, //static void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id, - std::vector<LLUUID>& member_ids) + uuid_vec_t& member_ids) { bool start_message = true; LLMessageSystem* msg = gMessageSystem; @@ -1746,7 +1746,7 @@ void LLGroupMgr::sendGroupMemberEjects(const LLUUID& group_id, LLGroupMgrGroupData* group_datap = LLGroupMgr::getInstance()->getGroupData(group_id); if (!group_datap) return; - for (std::vector<LLUUID>::iterator it = member_ids.begin(); + for (uuid_vec_t::iterator it = member_ids.begin(); it != member_ids.end(); ++it) { LLUUID& ejected_member_id = (*it); diff --git a/indra/newview/llgroupmgr.h b/indra/newview/llgroupmgr.h index 2c86de8b97..82df631b8c 100644 --- a/indra/newview/llgroupmgr.h +++ b/indra/newview/llgroupmgr.h @@ -139,8 +139,8 @@ public: const LLUUID& getID() const { return mRoleID; } - const std::vector<LLUUID>& getRoleMembers() const { return mMemberIDs; } - S32 getMembersInRole(std::vector<LLUUID> members, BOOL needs_sort = TRUE); + const uuid_vec_t& getRoleMembers() const { return mMemberIDs; } + S32 getMembersInRole(uuid_vec_t members, BOOL needs_sort = TRUE); S32 getTotalMembersInRole() { return mMemberIDs.size(); } LLRoleData getRoleData() const { return mRoleData; } @@ -150,10 +150,10 @@ public: bool removeMember(const LLUUID& member); void clearMembers(); - const std::vector<LLUUID>::const_iterator getMembersBegin() const + const uuid_vec_t::const_iterator getMembersBegin() const { return mMemberIDs.begin(); } - const std::vector<LLUUID>::const_iterator getMembersEnd() const + const uuid_vec_t::const_iterator getMembersEnd() const { return mMemberIDs.end(); } @@ -164,7 +164,7 @@ protected: LLUUID mRoleID; LLRoleData mRoleData; - std::vector<LLUUID> mMemberIDs; + uuid_vec_t mMemberIDs; S32 mMemberCount; private: @@ -340,7 +340,7 @@ public: static void sendGroupMemberJoin(const LLUUID& group_id); static void sendGroupMemberInvites(const LLUUID& group_id, std::map<LLUUID,LLUUID>& role_member_pairs); static void sendGroupMemberEjects(const LLUUID& group_id, - std::vector<LLUUID>& member_ids); + uuid_vec_t& member_ids); void cancelGroupRoleChanges(const LLUUID& group_id); diff --git a/indra/newview/llimfloater.cpp b/indra/newview/llimfloater.cpp index 91f4f57e54..9c477791b3 100644 --- a/indra/newview/llimfloater.cpp +++ b/indra/newview/llimfloater.cpp @@ -922,7 +922,7 @@ BOOL LLIMFloater::dropCallingCard(LLInventoryItem* item, BOOL drop) { if(drop) { - std::vector<LLUUID> ids; + uuid_vec_t ids; ids.push_back(item->getCreatorUUID()); inviteToSession(ids); } @@ -955,7 +955,7 @@ BOOL LLIMFloater::dropCategory(LLInventoryCategory* category, BOOL drop) } else if(drop) { - std::vector<LLUUID> ids; + uuid_vec_t ids; ids.reserve(count); for(S32 i = 0; i < count; ++i) { @@ -992,7 +992,7 @@ private: LLUUID mSessionID; }; -BOOL LLIMFloater::inviteToSession(const std::vector<LLUUID>& ids) +BOOL LLIMFloater::inviteToSession(const uuid_vec_t& ids) { LLViewerRegion* region = gAgent.getRegion(); if (!region) diff --git a/indra/newview/llimfloater.h b/indra/newview/llimfloater.h index 2f034d02b8..763dd5655b 100644 --- a/indra/newview/llimfloater.h +++ b/indra/newview/llimfloater.h @@ -129,7 +129,7 @@ private: BOOL dropCategory(LLInventoryCategory* category, BOOL drop); BOOL isInviteAllowed() const; - BOOL inviteToSession(const std::vector<LLUUID>& agent_ids); + BOOL inviteToSession(const uuid_vec_t& agent_ids); static void onInputEditorFocusReceived( LLFocusableElement* caller, void* userdata ); static void onInputEditorFocusLost(LLFocusableElement* caller, void* userdata); diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp index 7a4febec20..a8d876e8a3 100644 --- a/indra/newview/llimview.cpp +++ b/indra/newview/llimview.cpp @@ -146,7 +146,7 @@ LLIMModel::LLIMModel() addNewMsgCallback(toast_callback); } -LLIMModel::LLIMSession::LLIMSession(const LLUUID& session_id, const std::string& name, const EInstantMessage& type, const LLUUID& other_participant_id, const std::vector<LLUUID>& ids, bool voice) +LLIMModel::LLIMSession::LLIMSession(const LLUUID& session_id, const std::string& name, const EInstantMessage& type, const LLUUID& other_participant_id, const uuid_vec_t& ids, bool voice) : mSessionID(session_id), mName(name), mType(type), @@ -423,7 +423,7 @@ LLIMModel::LLIMSession* LLIMModel::findIMSession(const LLUUID& session_id) const } //*TODO consider switching to using std::set instead of std::list for holding LLUUIDs across the whole code -LLIMModel::LLIMSession* LLIMModel::findAdHocIMSession(const std::vector<LLUUID>& ids) +LLIMModel::LLIMSession* LLIMModel::findAdHocIMSession(const uuid_vec_t& ids) { S32 num = ids.size(); if (!num) return NULL; @@ -440,7 +440,7 @@ LLIMModel::LLIMSession* LLIMModel::findAdHocIMSession(const std::vector<LLUUID>& std::list<LLUUID> tmp_list(session->mInitialTargetIDs.begin(), session->mInitialTargetIDs.end()); - std::vector<LLUUID>::const_iterator iter = ids.begin(); + uuid_vec_t::const_iterator iter = ids.begin(); while (iter != ids.end()) { tmp_list.remove(*iter); @@ -571,7 +571,7 @@ void LLIMModel::testMessages() //session name should not be empty bool LLIMModel::newSession(const LLUUID& session_id, const std::string& name, const EInstantMessage& type, - const LLUUID& other_participant_id, const std::vector<LLUUID>& ids, bool voice) + const LLUUID& other_participant_id, const uuid_vec_t& ids, bool voice) { if (name.empty()) { @@ -596,7 +596,7 @@ bool LLIMModel::newSession(const LLUUID& session_id, const std::string& name, co bool LLIMModel::newSession(const LLUUID& session_id, const std::string& name, const EInstantMessage& type, const LLUUID& other_participant_id, bool voice) { - std::vector<LLUUID> no_ids; + uuid_vec_t no_ids; return newSession(session_id, name, type, other_participant_id, no_ids, voice); } @@ -1002,7 +1002,7 @@ void LLIMModel::sendMessage(const std::string& utf8_text, } else { - for(std::vector<LLUUID>::iterator it = session->mInitialTargetIDs.begin(); + for(uuid_vec_t::iterator it = session->mInitialTargetIDs.begin(); it!=session->mInitialTargetIDs.end();++it) { const LLUUID id = *it; @@ -1134,7 +1134,7 @@ private: bool LLIMModel::sendStartSession( const LLUUID& temp_session_id, const LLUUID& other_participant_id, - const std::vector<LLUUID>& ids, + const uuid_vec_t& ids, EInstantMessage dialog) { if ( dialog == IM_SESSION_GROUP_START ) diff --git a/indra/newview/llimview.h b/indra/newview/llimview.h index f1693d0e17..0a23fda9d8 100644 --- a/indra/newview/llimview.h +++ b/indra/newview/llimview.h @@ -61,7 +61,7 @@ public: } SType; LLIMSession(const LLUUID& session_id, const std::string& name, - const EInstantMessage& type, const LLUUID& other_participant_id, const std::vector<LLUUID>& ids, bool voice); + const EInstantMessage& type, const LLUUID& other_participant_id, const uuid_vec_t& ids, bool voice); virtual ~LLIMSession(); void sessionInitReplyReceived(const LLUUID& new_session_id); @@ -93,7 +93,7 @@ public: EInstantMessage mType; SType mSessionType; LLUUID mOtherParticipantID; - std::vector<LLUUID> mInitialTargetIDs; + uuid_vec_t mInitialTargetIDs; std::string mHistoryFileName; // connection to voice channel state change signal @@ -152,7 +152,7 @@ public: * Find an Ad-Hoc IM Session with specified participants * @return first found Ad-Hoc session or NULL if the session does not exist */ - LLIMSession* findAdHocIMSession(const std::vector<LLUUID>& ids); + LLIMSession* findAdHocIMSession(const uuid_vec_t& ids); /** * Rebind session data to a new session id. @@ -167,7 +167,7 @@ public: * @param name session name should not be empty, will return false if empty */ bool newSession(const LLUUID& session_id, const std::string& name, const EInstantMessage& type, const LLUUID& other_participant_id, - const std::vector<LLUUID>& ids, bool voice = false); + const uuid_vec_t& ids, bool voice = false); bool newSession(const LLUUID& session_id, const std::string& name, const EInstantMessage& type, const LLUUID& other_participant_id, bool voice = false); @@ -255,7 +255,7 @@ public: static void sendLeaveSession(const LLUUID& session_id, const LLUUID& other_participant_id); static bool sendStartSession(const LLUUID& temp_session_id, const LLUUID& other_participant_id, - const std::vector<LLUUID>& ids, EInstantMessage dialog); + const uuid_vec_t& ids, EInstantMessage dialog); static void sendTypingState(LLUUID session_id, LLUUID other_participant_id, BOOL typing); static void sendMessage(const std::string& utf8_text, const LLUUID& im_session_id, const LLUUID& other_participant_id, EInstantMessage dialog); diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index da21939a61..efd23c36ca 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -193,7 +193,7 @@ BOOL LLInvFVBridge::isItemRemovable() const } // Disable delete from COF folder; have users explicitly choose "detach/take off". - if (LLAppearanceManager::instance().getIsProtectedCOFItem(mUUID)) + if (LLAppearanceMgr::instance().getIsProtectedCOFItem(mUUID)) { return FALSE; } @@ -260,7 +260,7 @@ void LLInvFVBridge::removeBatch(LLDynamicArray<LLFolderViewEventListener*>& batc { if(LLAssetType::AT_GESTURE == item->getType()) { - LLGestureManager::instance().deactivateGesture(item->getUUID()); + LLGestureMgr::instance().deactivateGesture(item->getUUID()); } } } @@ -276,7 +276,7 @@ void LLInvFVBridge::removeBatch(LLDynamicArray<LLFolderViewEventListener*>& batc { if(LLAssetType::AT_GESTURE == descendent_items[j]->getType()) { - LLGestureManager::instance().deactivateGesture(descendent_items[j]->getUUID()); + LLGestureMgr::instance().deactivateGesture(descendent_items[j]->getUUID()); } } } @@ -297,7 +297,7 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener* LLMessageSystem* msg = gMessageSystem; const LLUUID trash_id = model->findCategoryUUIDForType(LLFolderType::FT_TRASH); LLViewerInventoryItem* item = NULL; - std::vector<LLUUID> move_ids; + uuid_vec_t move_ids; LLInventoryModel::update_map_t update; bool start_new_message = true; S32 count = batch.count(); @@ -398,8 +398,8 @@ void LLInvFVBridge::removeBatchNoCheck(LLDynamicArray<LLFolderViewEventListener* } // move everything. - std::vector<LLUUID>::iterator it = move_ids.begin(); - std::vector<LLUUID>::iterator end = move_ids.end(); + uuid_vec_t::iterator it = move_ids.begin(); + uuid_vec_t::iterator end = move_ids.end(); for(; it != end; ++it) { gInventory.moveObject((*it), trash_id); @@ -802,7 +802,7 @@ BOOL LLInvFVBridge::isAgentInventory() const BOOL LLInvFVBridge::isCOFFolder() const { - return LLAppearanceManager::instance().getIsInCOF(mUUID); + return LLAppearanceMgr::instance().getIsInCOF(mUUID); } BOOL LLInvFVBridge::isItemPermissive() const @@ -1506,11 +1506,7 @@ BOOL LLFolderBridge::isItemRemovable() const return FALSE; } - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if(!avatarp) - { - return FALSE; - } + if (!isAgentAvatarValid()) return FALSE; LLInventoryCategory* category = model->getCategory(mUUID); if(!category) @@ -1661,8 +1657,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat, LLInventoryModel* model = getInventoryModel(); if(!model) return FALSE; - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if(!avatarp) return FALSE; + if (!isAgentAvatarValid()) return FALSE; // cannot drag categories into library if(!isAgentInventory()) @@ -1748,9 +1743,9 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat, { LLInventoryItem* item = descendent_items[i]; if (item->getType() == LLAssetType::AT_GESTURE - && LLGestureManager::instance().isGestureActive(item->getUUID())) + && LLGestureMgr::instance().isGestureActive(item->getUUID())) { - LLGestureManager::instance().deactivateGesture(item->getUUID()); + LLGestureMgr::instance().deactivateGesture(item->getUUID()); } } } @@ -1763,7 +1758,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat, { // traverse category and add all contents to currently worn. BOOL append = true; - LLAppearanceManager::instance().wearInventoryCategory(inv_cat, false, append); + LLAppearanceMgr::instance().wearInventoryCategory(inv_cat, false, append); } else { @@ -1771,7 +1766,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat, LLInventoryModel::cat_array_t cats; LLInventoryModel::item_array_t items; gInventory.collectDescendents(inv_cat->getUUID(), cats, items, LLInventoryModel::EXCLUDE_TRASH); - LLAppearanceManager::instance().linkAll(mUUID,items,NULL); + LLAppearanceMgr::instance().linkAll(mUUID,items,NULL); } } else @@ -1780,7 +1775,7 @@ BOOL LLFolderBridge::dragCategoryIntoFolder(LLInventoryCategory* inv_cat, // BAP - should skip if dup. if (move_is_into_current_outfit) { - LLAppearanceManager::instance().addEnsembleLink(inv_cat); + LLAppearanceMgr::instance().addEnsembleLink(inv_cat); } else { @@ -2138,7 +2133,7 @@ void LLInventoryCopyAndWearObserver::changed(U32 mask) mContentsCount) { gInventory.removeObserver(this); - LLAppearanceManager::instance().wearInventoryCategory(category, FALSE, TRUE); + LLAppearanceMgr::instance().wearInventoryCategory(category, FALSE, TRUE); delete this; } } @@ -2188,7 +2183,7 @@ void LLFolderBridge::performAction(LLFolderView* folder, LLInventoryModel* model if(!model) return; LLViewerInventoryCategory* cat = getCategory(); if(!cat) return; - LLAppearanceManager::instance().addEnsembleLink(cat,true); + LLAppearanceMgr::instance().addEnsembleLink(cat,true); return; } #endif @@ -2418,9 +2413,9 @@ bool LLFolderBridge::removeItemResponse(const LLSD& notification, const LLSD& re const LLViewerInventoryItem* item = (*iter); const LLUUID& item_id = item->getUUID(); if (item->getType() == LLAssetType::AT_GESTURE - && LLGestureManager::instance().isGestureActive(item_id)) + && LLGestureMgr::instance().isGestureActive(item_id)) { - LLGestureManager::instance().deactivateGesture(item_id); + LLGestureMgr::instance().deactivateGesture(item_id); } } @@ -2723,7 +2718,7 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags) addDeleteContextMenuOptions(mItems, mDisabledItems); // EXT-4030: disallow deletion of currently worn outfit - const LLViewerInventoryItem *base_outfit_link = LLAppearanceManager::instance().getBaseOutfitLink(); + const LLViewerInventoryItem *base_outfit_link = LLAppearanceMgr::instance().getBaseOutfitLink(); if (base_outfit_link && (cat == base_outfit_link->getLinkedCategory())) { mDisabledItems.push_back(std::string("Delete")); @@ -2755,7 +2750,7 @@ void LLFolderBridge::buildContextMenu(LLMenuGL& menu, U32 flags) sSelf = this; LLRightClickInventoryFetchDescendentsObserver* fetch = new LLRightClickInventoryFetchDescendentsObserver(FALSE); - LLInventoryFetchDescendentsObserver::folder_ref_t folders; + uuid_vec_t folders; LLViewerInventoryCategory* category = (LLViewerInventoryCategory*)model->getCategory(mUUID); if (category) { @@ -2971,7 +2966,7 @@ void LLFolderBridge::modifyOutfit(BOOL append) LLViewerInventoryCategory* cat = getCategory(); if(!cat) return; - LLAppearanceManager::instance().wearInventoryCategory( cat, FALSE, append ); + LLAppearanceMgr::instance().wearInventoryCategory( cat, FALSE, append ); } // helper stuff @@ -3026,8 +3021,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, return FALSE; } - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if(!avatarp) return FALSE; + if (!isAgentAvatarValid()) return FALSE; LLToolDragAndDrop::ESource source = LLToolDragAndDrop::getInstance()->getSource(); BOOL accept = FALSE; @@ -3049,7 +3043,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, const LLUUID current_outfit_id = model->findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT); const BOOL move_is_into_current_outfit = (mUUID == current_outfit_id); const BOOL move_is_into_outfit = (getCategory() && getCategory()->getPreferredType()==LLFolderType::FT_OUTFIT); - const BOOL move_is_outof_current_outfit = LLAppearanceManager::instance().getIsInCOF(inv_item->getUUID()); + const BOOL move_is_outof_current_outfit = LLAppearanceMgr::instance().getIsInCOF(inv_item->getUUID()); // Can't explicitly drag things out of the COF. if (move_is_outof_current_outfit) @@ -3081,9 +3075,9 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, if(accept && drop) { if (inv_item->getType() == LLAssetType::AT_GESTURE - && LLGestureManager::instance().isGestureActive(inv_item->getUUID()) && move_is_into_trash) + && LLGestureMgr::instance().isGestureActive(inv_item->getUUID()) && move_is_into_trash) { - LLGestureManager::instance().deactivateGesture(inv_item->getUUID()); + LLGestureMgr::instance().deactivateGesture(inv_item->getUUID()); } // If an item is being dragged between windows, unselect // everything in the active window so that we don't follow @@ -3136,7 +3130,7 @@ BOOL LLFolderBridge::dragItemIntoFolder(LLInventoryItem* inv_item, // BAP - should skip if dup. if (move_is_into_current_outfit) { - LLAppearanceManager::instance().addCOFItemLink(inv_item); + LLAppearanceMgr::instance().addCOFItemLink(inv_item); } else { @@ -3795,7 +3789,7 @@ LLUIImagePtr LLGestureBridge::getIcon() const LLFontGL::StyleFlags LLGestureBridge::getLabelStyle() const { - if( LLGestureManager::instance().isGestureActive(mUUID) ) + if( LLGestureMgr::instance().isGestureActive(mUUID) ) { return LLFontGL::BOLD; } @@ -3807,7 +3801,7 @@ LLFontGL::StyleFlags LLGestureBridge::getLabelStyle() const std::string LLGestureBridge::getLabelSuffix() const { - if( LLGestureManager::instance().isGestureActive(mUUID) ) + if( LLGestureMgr::instance().isGestureActive(mUUID) ) { LLStringUtil::format_map_t args; args["[GESLABEL]"] = LLItemBridge::getLabelSuffix(); @@ -3824,7 +3818,7 @@ void LLGestureBridge::performAction(LLFolderView* folder, LLInventoryModel* mode { if (isAddAction(action)) { - LLGestureManager::instance().activateGesture(mUUID); + LLGestureMgr::instance().activateGesture(mUUID); LLViewerInventoryItem* item = gInventory.getItem(mUUID); if (!item) return; @@ -3836,7 +3830,7 @@ void LLGestureBridge::performAction(LLFolderView* folder, LLInventoryModel* mode } else if (isRemoveAction(action)) { - LLGestureManager::instance().deactivateGesture(mUUID); + LLGestureMgr::instance().deactivateGesture(mUUID); LLViewerInventoryItem* item = gInventory.getItem(mUUID); if (!item) return; @@ -3848,17 +3842,17 @@ void LLGestureBridge::performAction(LLFolderView* folder, LLInventoryModel* mode } else if("play" == action) { - if(!LLGestureManager::instance().isGestureActive(mUUID)) + if(!LLGestureMgr::instance().isGestureActive(mUUID)) { // we need to inform server about gesture activating to be consistent with LLPreviewGesture and LLGestureComboList. BOOL inform_server = TRUE; BOOL deactivate_similar = FALSE; - LLGestureManager::instance().setGestureLoadedCallback(mUUID, boost::bind(&LLGestureBridge::playGesture, mUUID)); + LLGestureMgr::instance().setGestureLoadedCallback(mUUID, boost::bind(&LLGestureBridge::playGesture, mUUID)); LLViewerInventoryItem* item = gInventory.getItem(mUUID); llassert(item); if (item) { - LLGestureManager::instance().activateGestureWithAsset(mUUID, item->getAssetUUID(), inform_server, deactivate_similar); + LLGestureMgr::instance().activateGestureWithAsset(mUUID, item->getAssetUUID(), inform_server, deactivate_similar); } } else @@ -3900,7 +3894,7 @@ BOOL LLGestureBridge::removeItem() // This will also force close the preview window, if it exists. // This may actually delete *this, if mUUID is in the COF. - LLGestureManager::instance().deactivateGesture(item_id); + LLGestureMgr::instance().deactivateGesture(item_id); // If deactivateGesture deleted *this, then return out immediately. if (!model->getObject(item_id)) @@ -3933,7 +3927,7 @@ void LLGestureBridge::buildContextMenu(LLMenuGL& menu, U32 flags) getClipboardEntries(true, items, disabled_items, flags); items.push_back(std::string("Gesture Separator")); - if (LLGestureManager::instance().isGestureActive(getUUID())) + if (LLGestureMgr::instance().isGestureActive(getUUID())) { items.push_back(std::string("Deactivate")); } @@ -3948,13 +3942,13 @@ void LLGestureBridge::buildContextMenu(LLMenuGL& menu, U32 flags) // static void LLGestureBridge::playGesture(const LLUUID& item_id) { - if (LLGestureManager::instance().isGesturePlaying(item_id)) + if (LLGestureMgr::instance().isGesturePlaying(item_id)) { - LLGestureManager::instance().stopGesture(item_id); + LLGestureMgr::instance().stopGesture(item_id); } else { - LLGestureManager::instance().playGesture(item_id); + LLGestureMgr::instance().playGesture(item_id); } } @@ -4155,8 +4149,7 @@ std::string LLObjectBridge::getLabelSuffix() const { if (get_is_item_worn(mUUID)) { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - std::string attachment_point_name = avatarp->getAttachedPointName(mUUID); + std::string attachment_point_name = gAgentAvatarp->getAttachedPointName(mUUID); // e.g. "(worn on ...)" / "(attached to ...)" LLStringUtil::format_map_t args; @@ -4175,10 +4168,10 @@ void rez_attachment(LLViewerInventoryItem* item, LLViewerJointAttachment* attach payload["item_id"] = item->getLinkedUUID(); // Wear the base object in case this is a link. S32 attach_pt = 0; - if (gAgent.getAvatarObject() && attachment) + if (isAgentAvatarValid() && attachment) { - for (LLVOAvatar::attachment_map_t::iterator iter = gAgent.getAvatarObject()->mAttachmentPoints.begin(); - iter != gAgent.getAvatarObject()->mAttachmentPoints.end(); ++iter) + for (LLVOAvatar::attachment_map_t::iterator iter = gAgentAvatarp->mAttachmentPoints.begin(); + iter != gAgentAvatarp->mAttachmentPoints.end(); ++iter) { if (iter->second == attachment) { @@ -4204,9 +4197,7 @@ void rez_attachment(LLViewerInventoryItem* item, LLViewerJointAttachment* attach bool confirm_replace_attachment_rez(const LLSD& notification, const LLSD& response) { - LLVOAvatar *avatarp = gAgent.getAvatarObject(); - - if (!avatarp->canAttachMoreObjects()) + if (!gAgentAvatarp->canAttachMoreObjects()) { LLSD args; args["MAX_ATTACHMENTS"] = llformat("%d", MAX_AGENT_ATTACHMENTS); @@ -4268,11 +4259,7 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags) LLInventoryItem *item = getItem(); if(item) { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if( !avatarp ) - { - return; - } + if (!isAgentAvatarValid()) return; if( get_is_item_worn( mUUID ) ) { @@ -4288,7 +4275,7 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags) // commented out for DEV-32347 //items.push_back(std::string("Restore to Last Position")); - if (!avatarp->canAttachMoreObjects()) + if (!gAgentAvatarp->canAttachMoreObjects()) { disabled_items.push_back(std::string("Object Wear")); disabled_items.push_back(std::string("Attach To")); @@ -4296,15 +4283,14 @@ void LLObjectBridge::buildContextMenu(LLMenuGL& menu, U32 flags) } LLMenuGL* attach_menu = menu.findChildMenuByName("Attach To", TRUE); LLMenuGL* attach_hud_menu = menu.findChildMenuByName("Attach To HUD", TRUE); - LLVOAvatar *avatarp = gAgent.getAvatarObject(); if (attach_menu && (attach_menu->getChildCount() == 0) && attach_hud_menu && (attach_hud_menu->getChildCount() == 0) - && avatarp) + && isAgentAvatarValid()) { - for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin(); - iter != avatarp->mAttachmentPoints.end(); ) + for (LLVOAvatar::attachment_map_t::iterator iter = gAgentAvatarp->mAttachmentPoints.begin(); + iter != gAgentAvatarp->mAttachmentPoints.end(); ) { LLVOAvatar::attachment_map_t::iterator curiter = iter++; LLViewerJointAttachment* attachment = curiter->second; @@ -4354,10 +4340,9 @@ BOOL LLObjectBridge::renameItem(const std::string& new_name) model->notifyObservers(); - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if(avatarp) + if (isAgentAvatarValid()) { - LLViewerObject* obj = avatarp->getWornAttachment( item->getUUID() ); + LLViewerObject* obj = gAgentAvatarp->getWornAttachment( item->getUUID() ); if(obj) { LLSelectMgr::getInstance()->deselectAll(); @@ -4410,7 +4395,7 @@ void wear_inventory_item_on_avatar( LLInventoryItem* item ) lldebugs << "wear_inventory_item_on_avatar( " << item->getName() << " )" << llendl; - LLAppearanceManager::instance().addCOFItemLink(item); + LLAppearanceMgr::instance().addCOFItemLink(item); } } @@ -4547,7 +4532,7 @@ void remove_inventory_category_from_avatar_step2( BOOL proceed, LLUUID category_ LLViewerInventoryItem *gest_item = gest_item_array.get(i); if (get_is_item_worn(gest_item->getUUID())) { - LLGestureManager::instance().deactivateGesture( gest_item->getLinkedUUID() ); + LLGestureMgr::instance().deactivateGesture( gest_item->getLinkedUUID() ); gInventory.updateItem( gest_item ); gInventory.notifyObservers(); } @@ -4969,20 +4954,7 @@ void LLWearableBridge::onRemoveFromAvatarArrived(LLWearable* wearable, } // Find and remove this item from the COF. - // FIXME 2.1 - call removeCOFItemLinks in llappearancemgr instead. - LLInventoryModel::item_array_t items = gInventory.collectLinkedItems(item_id, LLAppearanceManager::instance().getCOF()); - if (items.size() != 1) - { - llwarns << "Found " << items.size() << " COF links to " << item_id.asString() << ", expected 1" << llendl; - } - for (LLInventoryModel::item_array_t::const_iterator iter = items.begin(); - iter != items.end(); - ++iter) - { - const LLViewerInventoryItem *linked_item = (*iter); - const LLUUID &item_id = linked_item->getUUID(); - gInventory.purgeObject(item_id); - } + LLAppearanceMgr::instance().removeCOFItemLinks(item_id,false); gInventory.notifyObservers(); delete on_remove_struct; @@ -5008,20 +4980,7 @@ void LLWearableBridge::removeAllClothesFromAvatar() continue; // Find and remove this item from the COF. - LLInventoryModel::item_array_t items = gInventory.collectLinkedItems( - item_id, LLAppearanceManager::instance().getCOF()); - if (items.size() != 1) - { - llwarns << "Found " << items.size() << " COF links to " << item_id.asString() << ", expected 1" << llendl; - } - for (LLInventoryModel::item_array_t::const_iterator iter = items.begin(); - iter != items.end(); - ++iter) - { - const LLViewerInventoryItem *linked_item = (*iter); - const LLUUID &item_id = linked_item->getUUID(); - gInventory.purgeObject(item_id); - } + LLAppearanceMgr::instance().removeCOFItemLinks(item_id,false); } gInventory.notifyObservers(); diff --git a/indra/newview/llinventoryfunctions.cpp b/indra/newview/llinventoryfunctions.cpp index 3553137f53..1e0abeadf1 100644 --- a/indra/newview/llinventoryfunctions.cpp +++ b/indra/newview/llinventoryfunctions.cpp @@ -352,8 +352,7 @@ BOOL get_is_item_worn(const LLUUID& id) { case LLAssetType::AT_OBJECT: { - const LLVOAvatarSelf* my_avatar = gAgent.getAvatarObject(); - if(my_avatar && my_avatar->isWearingAttachment(item->getLinkedUUID())) + if (isAgentAvatarValid() && gAgentAvatarp->isWearingAttachment(item->getLinkedUUID())) return TRUE; break; } @@ -363,7 +362,7 @@ BOOL get_is_item_worn(const LLUUID& id) return TRUE; break; case LLAssetType::AT_GESTURE: - if (LLGestureManager::instance().isGestureActive(item->getLinkedUUID())) + if (LLGestureMgr::instance().isGestureActive(item->getLinkedUUID())) return TRUE; break; default: diff --git a/indra/newview/llinventorymodel.cpp b/indra/newview/llinventorymodel.cpp index 83a466a243..41f0b430e8 100644 --- a/indra/newview/llinventorymodel.cpp +++ b/indra/newview/llinventorymodel.cpp @@ -2595,7 +2595,7 @@ void LLInventoryModel::buildParentChildMap() } count = items.count(); lost = 0; - std::vector<LLUUID> lost_item_ids; + uuid_vec_t lost_item_ids; for(i = 0; i < count; ++i) { LLPointer<LLViewerInventoryItem> item; @@ -2634,7 +2634,7 @@ void LLInventoryModel::buildParentChildMap() LLMessageSystem* msg = gMessageSystem; BOOL start_new_message = TRUE; const LLUUID lnf = findCategoryUUIDForType(LLFolderType::FT_LOST_AND_FOUND); - for(std::vector<LLUUID>::iterator it = lost_item_ids.begin() ; it < lost_item_ids.end(); ++it) + for(uuid_vec_t::iterator it = lost_item_ids.begin() ; it < lost_item_ids.end(); ++it) { if(start_new_message) { @@ -3094,7 +3094,7 @@ void LLInventoryModel::processRemoveInventoryItem(LLMessageSystem* msg, void**) return; } S32 count = msg->getNumberOfBlocksFast(_PREHASH_InventoryData); - std::vector<LLUUID> item_ids; + uuid_vec_t item_ids; update_map_t update; for(S32 i = 0; i < count; ++i) { @@ -3110,7 +3110,7 @@ void LLInventoryModel::processRemoveInventoryItem(LLMessageSystem* msg, void**) } } gInventory.accountForUpdate(update); - for(std::vector<LLUUID>::iterator it = item_ids.begin(); it != item_ids.end(); ++it) + for(uuid_vec_t::iterator it = item_ids.begin(); it != item_ids.end(); ++it) { gInventory.deleteObject(*it); } @@ -3190,7 +3190,7 @@ void LLInventoryModel::processRemoveInventoryFolder(LLMessageSystem* msg, << llendl; return; } - std::vector<LLUUID> folder_ids; + uuid_vec_t folder_ids; update_map_t update; S32 count = msg->getNumberOfBlocksFast(_PREHASH_FolderData); for(S32 i = 0; i < count; ++i) @@ -3204,7 +3204,7 @@ void LLInventoryModel::processRemoveInventoryFolder(LLMessageSystem* msg, } } gInventory.accountForUpdate(update); - for(std::vector<LLUUID>::iterator it = folder_ids.begin(); it != folder_ids.end(); ++it) + for(uuid_vec_t::iterator it = folder_ids.begin(); it != folder_ids.end(); ++it) { gInventory.deleteObject(*it); } @@ -3317,7 +3317,7 @@ void LLInventoryModel::processBulkUpdateInventory(LLMessageSystem* msg, void**) count = msg->getNumberOfBlocksFast(_PREHASH_ItemData); - std::vector<LLUUID> wearable_ids; + uuid_vec_t wearable_ids; item_array_t items; std::list<InventoryCallbackInfo> cblist; for(i = 0; i < count; ++i) @@ -3774,7 +3774,6 @@ bool LLInventoryCollectFunctor::itemTransferCommonlyAllowed(LLInventoryItem* ite return false; bool allowed = false; - LLVOAvatarSelf* my_avatar = NULL; switch(item->getType()) { @@ -3783,8 +3782,7 @@ bool LLInventoryCollectFunctor::itemTransferCommonlyAllowed(LLInventoryItem* ite break; case LLAssetType::AT_OBJECT: - my_avatar = gAgent.getAvatarObject(); - if(my_avatar && !my_avatar->isWearingAttachment(item->getUUID())) + if (isAgentAvatarValid() && !gAgentAvatarp->isWearingAttachment(item->getUUID())) { allowed = true; } diff --git a/indra/newview/llinventoryobserver.cpp b/indra/newview/llinventoryobserver.cpp index 62c2d80609..9913be2e88 100644 --- a/indra/newview/llinventoryobserver.cpp +++ b/indra/newview/llinventoryobserver.cpp @@ -77,7 +77,7 @@ void LLInventoryCompletionObserver::changed(U32 mask) // appropriate. if(!mIncomplete.empty()) { - for(item_ref_t::iterator it = mIncomplete.begin(); it < mIncomplete.end(); ) + for(uuid_vec_t::iterator it = mIncomplete.begin(); it < mIncomplete.end(); ) { LLViewerInventoryItem* item = gInventory.getItem(*it); if(!item) @@ -262,7 +262,7 @@ void LLInventoryFetchObserver::fetchItems( // virtual void LLInventoryFetchDescendentsObserver::changed(U32 mask) { - for(folder_ref_t::iterator it = mIncompleteFolders.begin(); it < mIncompleteFolders.end();) + for(uuid_vec_t::iterator it = mIncompleteFolders.begin(); it < mIncompleteFolders.end();) { LLViewerInventoryCategory* cat = gInventory.getCategory(*it); if(!cat) @@ -285,9 +285,9 @@ void LLInventoryFetchDescendentsObserver::changed(U32 mask) } void LLInventoryFetchDescendentsObserver::fetchDescendents( - const folder_ref_t& ids) + const uuid_vec_t& ids) { - for(folder_ref_t::const_iterator it = ids.begin(); it != ids.end(); ++it) + for(uuid_vec_t::const_iterator it = ids.begin(); it != ids.end(); ++it) { LLViewerInventoryCategory* cat = gInventory.getCategory(*it); if(!cat) continue; @@ -355,7 +355,7 @@ void LLInventoryFetchComboObserver::changed(U32 mask) { if(!mIncompleteItems.empty()) { - for(item_ref_t::iterator it = mIncompleteItems.begin(); it < mIncompleteItems.end(); ) + for(uuid_vec_t::iterator it = mIncompleteItems.begin(); it < mIncompleteItems.end(); ) { LLViewerInventoryItem* item = gInventory.getItem(*it); if(!item) @@ -364,7 +364,7 @@ void LLInventoryFetchComboObserver::changed(U32 mask) continue; } if(item->isComplete()) - { + { mCompleteItems.push_back(*it); it = mIncompleteItems.erase(it); continue; @@ -374,7 +374,7 @@ void LLInventoryFetchComboObserver::changed(U32 mask) } if(!mIncompleteFolders.empty()) { - for(folder_ref_t::iterator it = mIncompleteFolders.begin(); it < mIncompleteFolders.end();) + for(uuid_vec_t::iterator it = mIncompleteFolders.begin(); it < mIncompleteFolders.end();) { LLViewerInventoryCategory* cat = gInventory.getCategory(*it); if(!cat) @@ -399,11 +399,11 @@ void LLInventoryFetchComboObserver::changed(U32 mask) } void LLInventoryFetchComboObserver::fetch( - const folder_ref_t& folder_ids, - const item_ref_t& item_ids) + const uuid_vec_t& folder_ids, + const uuid_vec_t& item_ids) { lldebugs << "LLInventoryFetchComboObserver::fetch()" << llendl; - for(folder_ref_t::const_iterator fit = folder_ids.begin(); fit != folder_ids.end(); ++fit) + for(uuid_vec_t::const_iterator fit = folder_ids.begin(); fit != folder_ids.end(); ++fit) { LLViewerInventoryCategory* cat = gInventory.getCategory(*fit); if(!cat) continue; @@ -426,7 +426,7 @@ void LLInventoryFetchComboObserver::fetch( // have to fetch it individually. LLSD items_llsd; LLUUID owner_id; - for(item_ref_t::const_iterator iit = item_ids.begin(); iit != item_ids.end(); ++iit) + for(uuid_vec_t::const_iterator iit = item_ids.begin(); iit != item_ids.end(); ++iit) { LLViewerInventoryItem* item = gInventory.getItem(*iit); if(!item) @@ -564,8 +564,8 @@ void LLInventoryTransactionObserver::changed(U32 mask) if(id == mTransactionID) { // woo hoo, we found it - folder_ref_t folders; - item_ref_t items; + uuid_vec_t folders; + uuid_vec_t items; S32 count; count = msg->getNumberOfBlocksFast(_PREHASH_FolderData); S32 i; diff --git a/indra/newview/llinventoryobserver.h b/indra/newview/llinventoryobserver.h index d6dded52d4..e1c8bd3faf 100644 --- a/indra/newview/llinventoryobserver.h +++ b/indra/newview/llinventoryobserver.h @@ -93,9 +93,8 @@ public: protected: virtual void done() = 0; - typedef std::vector<LLUUID> item_ref_t; - item_ref_t mComplete; - item_ref_t mIncomplete; + uuid_vec_t mComplete; + uuid_vec_t mIncomplete; }; @@ -113,7 +112,7 @@ public: LLInventoryFetchObserver(bool retry_if_missing = false): mRetryIfMissing(retry_if_missing) {} virtual void changed(U32 mask); - typedef std::vector<LLUUID> item_ref_t; + typedef uuid_vec_t item_ref_t; bool isEverythingComplete() const; void fetchItems(const item_ref_t& ids); @@ -138,15 +137,14 @@ public: LLInventoryFetchDescendentsObserver() {} virtual void changed(U32 mask); - typedef std::vector<LLUUID> folder_ref_t; - void fetchDescendents(const folder_ref_t& ids); + void fetchDescendents(const uuid_vec_t& ids); bool isEverythingComplete() const; virtual void done() = 0; protected: bool isComplete(LLViewerInventoryCategory* cat); - folder_ref_t mIncompleteFolders; - folder_ref_t mCompleteFolders; + uuid_vec_t mIncompleteFolders; + uuid_vec_t mCompleteFolders; }; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -163,18 +161,16 @@ public: LLInventoryFetchComboObserver() : mDone(false) {} virtual void changed(U32 mask); - typedef std::vector<LLUUID> folder_ref_t; - typedef std::vector<LLUUID> item_ref_t; - void fetch(const folder_ref_t& folder_ids, const item_ref_t& item_ids); + void fetch(const uuid_vec_t& folder_ids, const uuid_vec_t& item_ids); virtual void done() = 0; protected: bool mDone; - folder_ref_t mCompleteFolders; - folder_ref_t mIncompleteFolders; - item_ref_t mCompleteItems; - item_ref_t mIncompleteItems; + uuid_vec_t mCompleteFolders; + uuid_vec_t mIncompleteFolders; + uuid_vec_t mCompleteItems; + uuid_vec_t mIncompleteItems; }; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -197,7 +193,7 @@ public: protected: virtual void done() = 0; - typedef std::vector<LLUUID> item_ref_t; + typedef uuid_vec_t item_ref_t; item_ref_t mExist; item_ref_t mMIA; }; @@ -221,8 +217,7 @@ public: protected: virtual void done() = 0; - typedef std::vector<LLUUID> item_ref_t; - item_ref_t mAdded; + uuid_vec_t mAdded; }; //~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -242,9 +237,7 @@ public: virtual void changed(U32 mask); protected: - typedef std::vector<LLUUID> folder_ref_t; - typedef std::vector<LLUUID> item_ref_t; - virtual void done(const folder_ref_t& folders, const item_ref_t& items) = 0; + virtual void done(const uuid_vec_t& folders, const uuid_vec_t& items) = 0; LLTransactionID mTransactionID; }; diff --git a/indra/newview/llinventorypanel.cpp b/indra/newview/llinventorypanel.cpp index d7720b735c..9a2d76e7e2 100644 --- a/indra/newview/llinventorypanel.cpp +++ b/indra/newview/llinventorypanel.cpp @@ -723,7 +723,7 @@ void LLInventoryPanel::setSelection(const LLUUID& obj_id, BOOL take_keyboard_foc { // Don't select objects in COF (e.g. to prevent refocus when items are worn). const LLInventoryObject *obj = gInventory.getObject(obj_id); - if (obj && obj->getParentUUID() == LLAppearanceManager::instance().getCOF()) + if (obj && obj->getParentUUID() == LLAppearanceMgr::instance().getCOF()) { return; } @@ -871,10 +871,9 @@ bool LLInventoryPanel::attachObject(const LLSD& userdata) mFolders->getSelectionList(selected_items); std::string joint_name = userdata.asString(); - LLVOAvatar *avatarp = static_cast<LLVOAvatar*>(gAgent.getAvatarObject()); LLViewerJointAttachment* attachmentp = NULL; - for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin(); - iter != avatarp->mAttachmentPoints.end(); ) + for (LLVOAvatar::attachment_map_t::iterator iter = gAgentAvatarp->mAttachmentPoints.begin(); + iter != gAgentAvatarp->mAttachmentPoints.end(); ) { LLVOAvatar::attachment_map_t::iterator curiter = iter++; LLViewerJointAttachment* attachment = curiter->second; diff --git a/indra/newview/lllocationinputctrl.cpp b/indra/newview/lllocationinputctrl.cpp index 4100e2fc61..ba50287ebd 100644 --- a/indra/newview/lllocationinputctrl.cpp +++ b/indra/newview/lllocationinputctrl.cpp @@ -108,7 +108,7 @@ public: private: /*virtual*/ void done() { - std::vector<LLUUID>::const_iterator it = mAdded.begin(), end = mAdded.end(); + uuid_vec_t::const_iterator it = mAdded.begin(), end = mAdded.end(); for(; it != end; ++it) { LLInventoryItem* item = gInventory.getItem(*it); diff --git a/indra/newview/llmaniprotate.cpp b/indra/newview/llmaniprotate.cpp index 6dc0a929c8..6747bcb9c9 100644 --- a/indra/newview/llmaniprotate.cpp +++ b/indra/newview/llmaniprotate.cpp @@ -65,6 +65,7 @@ #include "lldrawable.h" #include "llglheaders.h" #include "lltrans.h" +#include "llvoavatarself.h" const F32 RADIUS_PIXELS = 100.f; // size in screen space const F32 SQ_RADIUS = RADIUS_PIXELS * RADIUS_PIXELS; @@ -739,7 +740,7 @@ void LLManipRotate::renderSnapGuides() LLVector3 test_axis = constraint_axis; BOOL constrain_to_ref_object = FALSE; - if (mObjectSelection->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject()) + if (mObjectSelection->getSelectType() == SELECT_TYPE_ATTACHMENT && isAgentAvatarValid()) { test_axis = test_axis * ~grid_rotation; } @@ -766,7 +767,7 @@ void LLManipRotate::renderSnapGuides() } LLVector3 projected_snap_axis = world_snap_axis; - if (mObjectSelection->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject()) + if (mObjectSelection->getSelectType() == SELECT_TYPE_ATTACHMENT && isAgentAvatarValid()) { projected_snap_axis = projected_snap_axis * grid_rotation; } @@ -1282,7 +1283,7 @@ LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y ) LLVector3 axis2; LLVector3 test_axis = constraint_axis; - if (mObjectSelection->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject()) + if (mObjectSelection->getSelectType() == SELECT_TYPE_ATTACHMENT && isAgentAvatarValid()) { test_axis = test_axis * ~grid_rotation; } @@ -1306,7 +1307,7 @@ LLQuaternion LLManipRotate::dragConstrained( S32 x, S32 y ) axis1 = LLVector3::x_axis; } - if (mObjectSelection->getSelectType() == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject()) + if (mObjectSelection->getSelectType() == SELECT_TYPE_ATTACHMENT && isAgentAvatarValid()) { axis1 = axis1 * grid_rotation; } diff --git a/indra/newview/llmaniptranslate.cpp b/indra/newview/llmaniptranslate.cpp index 35c4f7f787..5f0c5e1795 100644 --- a/indra/newview/llmaniptranslate.cpp +++ b/indra/newview/llmaniptranslate.cpp @@ -714,7 +714,7 @@ BOOL LLManipTranslate::handleHover(S32 x, S32 y, MASK mask) // in position changes even when the mouse moves object->setPosition(new_position_local); rebuild(object); - gAgent.getAvatarObject()->clampAttachmentPositions(); + gAgentAvatarp->clampAttachmentPositions(); new_position_local = object->getPosition(); if (selectNode->mIndividualSelection) diff --git a/indra/newview/llmorphview.cpp b/indra/newview/llmorphview.cpp index 47234eb773..d670eb6ffd 100644 --- a/indra/newview/llmorphview.cpp +++ b/indra/newview/llmorphview.cpp @@ -89,15 +89,14 @@ void LLMorphView::initialize() mCameraYaw = 0.f; mCameraDist = -1.f; - LLVOAvatar *avatarp = gAgent.getAvatarObject(); - if (!avatarp || avatarp->isDead()) + if (!isAgentAvatarValid() || gAgentAvatarp->isDead()) { gAgentCamera.changeCameraToDefault(); return; } - avatarp->stopMotion( ANIM_AGENT_BODY_NOISE ); - avatarp->mSpecialRenderMode = 3; + gAgentAvatarp->stopMotion( ANIM_AGENT_BODY_NOISE ); + gAgentAvatarp->mSpecialRenderMode = 3; // set up camera for close look at avatar mOldCameraNearClip = LLViewerCamera::getInstance()->getNear(); @@ -111,11 +110,10 @@ void LLMorphView::shutdown() { LLVOAvatarSelf::onCustomizeEnd(); - LLVOAvatar *avatarp = gAgent.getAvatarObject(); - if(avatarp && !avatarp->isDead()) + if (isAgentAvatarValid()) { - avatarp->startMotion( ANIM_AGENT_BODY_NOISE ); - avatarp->mSpecialRenderMode = 0; + gAgentAvatarp->startMotion( ANIM_AGENT_BODY_NOISE ); + gAgentAvatarp->mSpecialRenderMode = 0; // reset camera LLViewerCamera::getInstance()->setNear(mOldCameraNearClip); } @@ -164,15 +162,11 @@ void LLMorphView::updateCamera() { if (!mCameraTargetJoint) { - setCameraTargetJoint(gAgent.getAvatarObject()->getJoint("mHead")); - } - - LLVOAvatar* avatar = gAgent.getAvatarObject(); - if( !avatar ) - { - return; - } - LLJoint* root_joint = avatar->getRootJoint(); + setCameraTargetJoint(gAgentAvatarp->getJoint("mHead")); + } + if (!isAgentAvatarValid()) return; + + LLJoint* root_joint = gAgentAvatarp->getRootJoint(); if( !root_joint ) { return; diff --git a/indra/newview/llmoveview.cpp b/indra/newview/llmoveview.cpp index 58fac14349..0f22a50093 100644 --- a/indra/newview/llmoveview.cpp +++ b/indra/newview/llmoveview.cpp @@ -42,7 +42,7 @@ #include "llagent.h" #include "llagentcamera.h" -#include "llvoavatarself.h" // to check gAgent.getAvatarObject()->isSitting() +#include "llvoavatarself.h" // to check gAgentAvatarp->isSitting() #include "llbottomtray.h" #include "llbutton.h" #include "llfloaterreg.h" @@ -332,7 +332,7 @@ void LLFloaterMove::setMovementMode(const EMovementMode mode) updateButtonsWithMovementMode(mode); bool bHideModeButtons = MM_FLY == mode - || (gAgent.getAvatarObject() && gAgent.getAvatarObject()->isSitting()); + || (isAgentAvatarValid() && gAgentAvatarp->isSitting()); showModeButtons(!bHideModeButtons); @@ -388,9 +388,9 @@ void LLFloaterMove::initMovementMode() } setMovementMode(initMovementMode); - if (gAgent.getAvatarObject()) + if (isAgentAvatarValid()) { - setEnabled(!gAgent.getAvatarObject()->isSitting()); + setEnabled(!gAgentAvatarp->isSitting()); } } @@ -491,7 +491,7 @@ void LLFloaterMove::onOpen(const LLSD& key) showModeButtons(FALSE); } - if (gAgent.getAvatarObject() && gAgent.getAvatarObject()->isSitting()) + if (isAgentAvatarValid() && gAgentAvatarp->isSitting()) { setSittingMode(TRUE); showModeButtons(FALSE); diff --git a/indra/newview/llnearbychatbar.cpp b/indra/newview/llnearbychatbar.cpp index af711b6943..424b8c9a66 100644 --- a/indra/newview/llnearbychatbar.cpp +++ b/indra/newview/llnearbychatbar.cpp @@ -103,7 +103,7 @@ LLGestureComboList::LLGestureComboList(const LLGestureComboList::Params& p) setCommitCallback(boost::bind(&LLGestureComboList::onCommitGesture, this)); // now register us as observer since we have a place to put the results - LLGestureManager::instance().addObserver(this); + LLGestureMgr::instance().addObserver(this); // refresh list from current active gestures refreshGestures(); @@ -244,8 +244,8 @@ void LLGestureComboList::refreshGestures() mList->clearRows(); mGestures.clear(); - LLGestureManager::item_map_t::const_iterator it; - const LLGestureManager::item_map_t& active_gestures = LLGestureManager::instance().getActiveGestures(); + LLGestureMgr::item_map_t::const_iterator it; + const LLGestureMgr::item_map_t& active_gestures = LLGestureMgr::instance().getActiveGestures(); LLSD::Integer idx(0); for (it = active_gestures.begin(); it != active_gestures.end(); ++it) { @@ -289,7 +289,7 @@ void LLGestureComboList::refreshGestures() gesture = mGestures.at(index); } - if(gesture && LLGestureManager::instance().isGesturePlaying(gesture)) + if(gesture && LLGestureMgr::instance().isGesturePlaying(gesture)) { return; } @@ -321,7 +321,7 @@ void LLGestureComboList::onCommitGesture() LLMultiGesture* gesture = mGestures.at(index); if(gesture) { - LLGestureManager::instance().playGesture(gesture); + LLGestureMgr::instance().playGesture(gesture); if(!gesture->mReplaceText.empty()) { LLNearbyChatBar::sendChatFromViewer(gesture->mReplaceText, CHAT_TYPE_NORMAL, FALSE); @@ -332,7 +332,7 @@ void LLGestureComboList::onCommitGesture() LLGestureComboList::~LLGestureComboList() { - LLGestureManager::instance().removeObserver(this); + LLGestureMgr::instance().removeObserver(this); } LLNearbyChatBar::LLNearbyChatBar() @@ -476,7 +476,7 @@ void LLNearbyChatBar::onChatBoxKeystroke(LLLineEditor* caller, void* userdata) std::string utf8_trigger = wstring_to_utf8str(raw_text); std::string utf8_out_str(utf8_trigger); - if (LLGestureManager::instance().matchPrefix(utf8_trigger, &utf8_out_str)) + if (LLGestureMgr::instance().matchPrefix(utf8_trigger, &utf8_out_str)) { std::string rest_of_match = utf8_out_str.substr(utf8_trigger.size()); self->mChatBox->setText(utf8_trigger + rest_of_match); // keep original capitalization for user-entered part @@ -558,7 +558,7 @@ void LLNearbyChatBar::sendChat( EChatType type ) if (0 == channel) { // discard returned "found" boolean - LLGestureManager::instance().triggerAndReviseString(utf8text, &utf8_revised_text); + LLGestureMgr::instance().triggerAndReviseString(utf8text, &utf8_revised_text); } else { diff --git a/indra/newview/llpanelblockedlist.cpp b/indra/newview/llpanelblockedlist.cpp index a186bc926c..c72f0f8012 100644 --- a/indra/newview/llpanelblockedlist.cpp +++ b/indra/newview/llpanelblockedlist.cpp @@ -186,7 +186,7 @@ void LLPanelBlockedList::onBlockByNameClick() LLFloaterGetBlockedObjectName::show(&LLPanelBlockedList::callbackBlockByName); } -void LLPanelBlockedList::callbackBlockPicked(const std::vector<std::string>& names, const std::vector<LLUUID>& ids) +void LLPanelBlockedList::callbackBlockPicked(const std::vector<std::string>& names, const uuid_vec_t& ids) { if (names.empty() || ids.empty()) return; LLMute mute(ids[0], names[0], LLMute::AGENT); diff --git a/indra/newview/llpanelblockedlist.h b/indra/newview/llpanelblockedlist.h index 1ef16a02f4..a100577e43 100644 --- a/indra/newview/llpanelblockedlist.h +++ b/indra/newview/llpanelblockedlist.h @@ -78,7 +78,7 @@ private: void onPickBtnClick(); void onBlockByNameClick(); - void callbackBlockPicked(const std::vector<std::string>& names, const std::vector<LLUUID>& ids); + void callbackBlockPicked(const std::vector<std::string>& names, const uuid_vec_t& ids); static void callbackBlockByName(const std::string& text); private: diff --git a/indra/newview/llpaneleditwearable.cpp b/indra/newview/llpaneleditwearable.cpp index e7acc68b93..805016f089 100644 --- a/indra/newview/llpaneleditwearable.cpp +++ b/indra/newview/llpaneleditwearable.cpp @@ -602,7 +602,7 @@ LLPanel* LLPanelEditWearable::getPanel(EWearableType type) void LLPanelEditWearable::getSortedParams(value_map_t &sorted_params, const std::string &edit_group) { LLWearable::visual_param_vec_t param_list; - ESex avatar_sex = gAgent.getAvatarObject()->getSex(); + ESex avatar_sex = gAgentAvatarp->getSex(); mWearablePtr->getVisualParams(param_list); diff --git a/indra/newview/llpanelgroupgeneral.cpp b/indra/newview/llpanelgroupgeneral.cpp index 517204b232..0a83ba8212 100644 --- a/indra/newview/llpanelgroupgeneral.cpp +++ b/indra/newview/llpanelgroupgeneral.cpp @@ -820,15 +820,15 @@ void LLPanelGroupGeneral::reset() mCtrlListGroup->set(true); - mCtrlReceiveNotices->setEnabled(true); + mCtrlReceiveNotices->setEnabled(false); mCtrlReceiveNotices->setVisible(true); - mCtrlListGroup->setEnabled(true); + mCtrlListGroup->setEnabled(false); mGroupNameEditor->setEnabled(TRUE); mEditCharter->setEnabled(TRUE); - mCtrlShowInGroupList->setEnabled(TRUE); + mCtrlShowInGroupList->setEnabled(false); mComboMature->setEnabled(TRUE); mCtrlOpenEnrollment->setEnabled(TRUE); @@ -934,6 +934,8 @@ void LLPanelGroupGeneral::setGroupID(const LLUUID& id) mCtrlListGroup->setEnabled(data.mID.notNull()); } + mCtrlShowInGroupList->setEnabled(data.mID.notNull()); + mActiveTitleLabel = getChild<LLTextBox>("active_title_label"); mComboActiveTitle = getChild<LLComboBox>("active_title"); diff --git a/indra/newview/llpanelgroupinvite.cpp b/indra/newview/llpanelgroupinvite.cpp index 05261a65de..11d3768a3d 100644 --- a/indra/newview/llpanelgroupinvite.cpp +++ b/indra/newview/llpanelgroupinvite.cpp @@ -57,7 +57,7 @@ public: ~impl(); void addUsers(const std::vector<std::string>& names, - const std::vector<LLUUID>& agent_ids); + const uuid_vec_t& agent_ids); void submitInvitations(); void addRoleNames(LLGroupMgrGroupData* gdatap); void handleRemove(); @@ -69,7 +69,7 @@ public: static void callbackClickRemove(void* userdata); static void callbackSelect(LLUICtrl* ctrl, void* userdata); static void callbackAddUsers(const std::vector<std::string>& names, - const std::vector<LLUUID>& agent_ids, + const uuid_vec_t& agent_ids, void* user_data); bool inviteOwnerCallback(const LLSD& notification, const LLSD& response); @@ -111,7 +111,7 @@ LLPanelGroupInvite::impl::~impl() } void LLPanelGroupInvite::impl::addUsers(const std::vector<std::string>& names, - const std::vector<LLUUID>& agent_ids) + const uuid_vec_t& agent_ids) { std::string name; LLUUID id; @@ -361,7 +361,7 @@ void LLPanelGroupInvite::impl::callbackClickOK(void* userdata) //static void LLPanelGroupInvite::impl::callbackAddUsers(const std::vector<std::string>& names, - const std::vector<LLUUID>& ids, + const uuid_vec_t& ids, void* user_data) { impl* selfp = (impl*) user_data; @@ -399,7 +399,7 @@ void LLPanelGroupInvite::clear() mImplementation->mOKButton->setEnabled(FALSE); } -void LLPanelGroupInvite::addUsers(std::vector<LLUUID>& agent_ids) +void LLPanelGroupInvite::addUsers(uuid_vec_t& agent_ids) { std::vector<std::string> names; for (S32 i = 0; i < (S32)agent_ids.size(); i++) @@ -456,7 +456,7 @@ void LLPanelGroupInvite::addUsers(std::vector<LLUUID>& agent_ids) void LLPanelGroupInvite::addUserCallback(const LLUUID& id, const std::string& first_name, const std::string& last_name) { std::vector<std::string> names; - std::vector<LLUUID> agent_ids; + uuid_vec_t agent_ids; std::string full_name = first_name + " " + last_name; agent_ids.push_back(id); names.push_back(first_name + " " + last_name); diff --git a/indra/newview/llpanelgroupinvite.h b/indra/newview/llpanelgroupinvite.h index b095dd2395..2ed443ed46 100644 --- a/indra/newview/llpanelgroupinvite.h +++ b/indra/newview/llpanelgroupinvite.h @@ -42,7 +42,7 @@ public: LLPanelGroupInvite(const LLUUID& group_id); ~LLPanelGroupInvite(); - void addUsers(std::vector<LLUUID>& agent_ids); + void addUsers(uuid_vec_t& agent_ids); /** * this callback is being used to add a user whose fullname isn't been loaded before invoking of addUsers(). */ diff --git a/indra/newview/llpanelgrouproles.cpp b/indra/newview/llpanelgrouproles.cpp index c6287472fe..0c24e6ad22 100644 --- a/indra/newview/llpanelgrouproles.cpp +++ b/indra/newview/llpanelgrouproles.cpp @@ -859,7 +859,7 @@ void LLPanelGroupMembersSubTab::handleMemberSelect() if (selection.empty()) return; // Build a vector of all selected members, and gather allowed actions. - std::vector<LLUUID> selected_members; + uuid_vec_t selected_members; U64 allowed_by_all = 0xffffffffffffLL; U64 allowed_by_some = 0; @@ -925,8 +925,8 @@ void LLPanelGroupMembersSubTab::handleMemberSelect() if (cb_enable && (count > 0) && role_id == gdatap->mOwnerRole) { // Check if any owners besides this agent are selected. - std::vector<LLUUID>::const_iterator member_iter; - std::vector<LLUUID>::const_iterator member_end = + uuid_vec_t::const_iterator member_iter; + uuid_vec_t::const_iterator member_end = selected_members.end(); for (member_iter = selected_members.begin(); member_iter != member_end; @@ -952,7 +952,7 @@ void LLPanelGroupMembersSubTab::handleMemberSelect() //now see if there are any role changes for the selected //members and remember to include them - std::vector<LLUUID>::iterator sel_mem_iter = selected_members.begin(); + uuid_vec_t::iterator sel_mem_iter = selected_members.begin(); for (; sel_mem_iter != selected_members.end(); sel_mem_iter++) { LLRoleMemberChangeType type; @@ -1009,7 +1009,7 @@ void LLPanelGroupMembersSubTab::handleMemberSelect() check->setTentative( (0 != count) && (selected_members.size() != - (std::vector<LLUUID>::size_type)count)); + (uuid_vec_t::size_type)count)); //NOTE: as of right now a user can break the group //by removing himself from a role if he is the @@ -1084,7 +1084,7 @@ void LLPanelGroupMembersSubTab::onEjectMembers(void *userdata) void LLPanelGroupMembersSubTab::handleEjectMembers() { //send down an eject message - std::vector<LLUUID> selected_members; + uuid_vec_t selected_members; std::vector<LLScrollListItem*> selection = mMembersList->getAllSelected(); if (selection.empty()) return; @@ -1105,13 +1105,13 @@ void LLPanelGroupMembersSubTab::handleEjectMembers() selected_members); } -void LLPanelGroupMembersSubTab::sendEjectNotifications(const LLUUID& group_id, const std::vector<LLUUID>& selected_members) +void LLPanelGroupMembersSubTab::sendEjectNotifications(const LLUUID& group_id, const uuid_vec_t& selected_members) { LLGroupMgrGroupData* group_data = LLGroupMgr::getInstance()->getGroupData(group_id); if (group_data) { - for (std::vector<LLUUID>::const_iterator i = selected_members.begin(); i != selected_members.end(); ++i) + for (uuid_vec_t::const_iterator i = selected_members.begin(); i != selected_members.end(); ++i) { LLSD args; std::string name; @@ -1437,7 +1437,7 @@ U64 LLPanelGroupMembersSubTab::getAgentPowersBasedOnRoleChanges(const LLUUID& ag if ( role_change_datap ) { - std::vector<LLUUID> roles_to_be_removed; + uuid_vec_t roles_to_be_removed; for (role_change_data_map_t::iterator role = role_change_datap->begin(); role != role_change_datap->end(); ++ role) @@ -2086,8 +2086,8 @@ void LLPanelGroupRolesSubTab::buildMembersList() LLGroupRoleData* rdatap = (*rit).second; if (rdatap) { - std::vector<LLUUID>::const_iterator mit = rdatap->getMembersBegin(); - std::vector<LLUUID>::const_iterator end = rdatap->getMembersEnd(); + uuid_vec_t::const_iterator mit = rdatap->getMembersBegin(); + uuid_vec_t::const_iterator end = rdatap->getMembersEnd(); for ( ; mit != end; ++mit) { mAssignedMembersList->addNameItem((*mit)); diff --git a/indra/newview/llpanelgrouproles.h b/indra/newview/llpanelgrouproles.h index eac22a6338..98cebe9882 100644 --- a/indra/newview/llpanelgrouproles.h +++ b/indra/newview/llpanelgrouproles.h @@ -173,7 +173,7 @@ public: static void onEjectMembers(void*); void handleEjectMembers(); - void sendEjectNotifications(const LLUUID& group_id, const std::vector<LLUUID>& selected_members); + void sendEjectNotifications(const LLUUID& group_id, const uuid_vec_t& selected_members); static void onRoleCheck(LLUICtrl* check, void* user_data); void handleRoleCheck(const LLUUID& role_id, diff --git a/indra/newview/llpanellogin.cpp b/indra/newview/llpanellogin.cpp index 7bd03167fd..ee4dcc44fe 100644 --- a/indra/newview/llpanellogin.cpp +++ b/indra/newview/llpanellogin.cpp @@ -679,6 +679,9 @@ void LLPanelLogin::refreshLocation( bool force_visible ) show_start = gSavedSettings.getBOOL("ShowStartLocation"); } + // Update the value of the location combo. + updateLocationUI(); + sInstance->childSetVisible("start_location_combo", show_start); sInstance->childSetVisible("start_location_text", show_start); diff --git a/indra/newview/llpaneloutfitsinventory.cpp b/indra/newview/llpaneloutfitsinventory.cpp index c2f2d32142..6bda7d1546 100644 --- a/indra/newview/llpaneloutfitsinventory.cpp +++ b/indra/newview/llpaneloutfitsinventory.cpp @@ -271,7 +271,7 @@ void LLPanelOutfitsInventory::onSave() { std::string outfit_name; - if (!LLAppearanceManager::getInstance()->getBaseOutfitName(outfit_name)) + if (!LLAppearanceMgr::getInstance()->getBaseOutfitName(outfit_name)) { outfit_name = LLViewerFolderType::lookupNewCategoryName(LLFolderType::FT_OUTFIT); } diff --git a/indra/newview/llpanelpeople.cpp b/indra/newview/llpanelpeople.cpp index 03e8ab644e..8a1be2706c 100644 --- a/indra/newview/llpanelpeople.cpp +++ b/indra/newview/llpanelpeople.cpp @@ -134,13 +134,13 @@ public: typedef std::map < LLUUID, LLVector3d > id_to_pos_map_t; LLAvatarItemDistanceComparator() {}; - void updateAvatarsPositions(std::vector<LLVector3d>& positions, std::vector<LLUUID>& uuids) + void updateAvatarsPositions(std::vector<LLVector3d>& positions, uuid_vec_t& uuids) { std::vector<LLVector3d>::const_iterator pos_it = positions.begin(), pos_end = positions.end(); - std::vector<LLUUID>::const_iterator + uuid_vec_t::const_iterator id_it = uuids.begin(), id_end = uuids.end(); @@ -756,7 +756,7 @@ void LLPanelPeople::updateButtons() //bool recent_tab_active = (cur_tab == RECENT_TAB_NAME); LLUUID selected_id; - std::vector<LLUUID> selected_uuids; + uuid_vec_t selected_uuids; getCurrentItemIDs(selected_uuids); bool item_selected = (selected_uuids.size() == 1); bool multiple_selected = (selected_uuids.size() >= 1); @@ -852,7 +852,7 @@ LLUUID LLPanelPeople::getCurrentItemID() const return LLUUID::null; } -void LLPanelPeople::getCurrentItemIDs(std::vector<LLUUID>& selected_uuids) const +void LLPanelPeople::getCurrentItemIDs(uuid_vec_t& selected_uuids) const { std::string cur_tab = getActiveTabName(); @@ -1063,10 +1063,10 @@ void LLPanelPeople::onAddFriendButtonClicked() } } -bool LLPanelPeople::isItemsFreeOfFriends(const std::vector<LLUUID>& uuids) +bool LLPanelPeople::isItemsFreeOfFriends(const uuid_vec_t& uuids) { const LLAvatarTracker& av_tracker = LLAvatarTracker::instance(); - for ( std::vector<LLUUID>::const_iterator + for ( uuid_vec_t::const_iterator id = uuids.begin(), id_end = uuids.end(); id != id_end; ++id ) @@ -1094,7 +1094,7 @@ void LLPanelPeople::onAddFriendWizButtonClicked() void LLPanelPeople::onDeleteFriendButtonClicked() { - std::vector<LLUUID> selected_uuids; + uuid_vec_t selected_uuids; getCurrentItemIDs(selected_uuids); if (selected_uuids.size() == 1) @@ -1121,7 +1121,7 @@ void LLPanelPeople::onChatButtonClicked() void LLPanelPeople::onImButtonClicked() { - std::vector<LLUUID> selected_uuids; + uuid_vec_t selected_uuids; getCurrentItemIDs(selected_uuids); if ( selected_uuids.size() == 1 ) { @@ -1143,7 +1143,7 @@ void LLPanelPeople::onActivateButtonClicked() // static void LLPanelPeople::onAvatarPicked( const std::vector<std::string>& names, - const std::vector<LLUUID>& ids) + const uuid_vec_t& ids) { if (!names.empty() && !ids.empty()) LLAvatarActions::requestFriendshipDialog(ids[0], names[0]); @@ -1293,7 +1293,7 @@ bool LLPanelPeople::onRecentViewSortMenuItemCheck(const LLSD& userdata) void LLPanelPeople::onCallButtonClicked() { - std::vector<LLUUID> selected_uuids; + uuid_vec_t selected_uuids; getCurrentItemIDs(selected_uuids); if (selected_uuids.size() == 1) diff --git a/indra/newview/llpanelpeople.h b/indra/newview/llpanelpeople.h index 6d3d436156..891381e2de 100644 --- a/indra/newview/llpanelpeople.h +++ b/indra/newview/llpanelpeople.h @@ -78,12 +78,12 @@ private: void updateRecentList(); bool isFriendOnline(const LLUUID& id); - bool isItemsFreeOfFriends(const std::vector<LLUUID>& uuids); + bool isItemsFreeOfFriends(const uuid_vec_t& uuids); void updateButtons(); std::string getActiveTabName() const; LLUUID getCurrentItemID() const; - void getCurrentItemIDs(std::vector<LLUUID>& selected_uuids) const; + void getCurrentItemIDs(uuid_vec_t& selected_uuids) const; void buttonSetVisible(std::string btn_name, BOOL visible); void buttonSetEnabled(const std::string& btn_name, bool enabled); void buttonSetAction(const std::string& btn_name, const commit_signal_t::slot_type& cb); @@ -134,7 +134,7 @@ private: // misc callbacks static void onAvatarPicked( const std::vector<std::string>& names, - const std::vector<LLUUID>& ids); + const uuid_vec_t& ids); void onFriendsAccordionExpandedCollapsed(LLUICtrl* ctrl, const LLSD& param, LLAvatarList* avatar_list); diff --git a/indra/newview/llpanelpeoplemenus.cpp b/indra/newview/llpanelpeoplemenus.cpp index 854651cd01..8b365c6433 100644 --- a/indra/newview/llpanelpeoplemenus.cpp +++ b/indra/newview/llpanelpeoplemenus.cpp @@ -72,7 +72,7 @@ ContextMenu::~ContextMenu() } } -void ContextMenu::show(LLView* spawning_view, const std::vector<LLUUID>& uuids, S32 x, S32 y) +void ContextMenu::show(LLView* spawning_view, const uuid_vec_t& uuids, S32 x, S32 y) { if (mMenu) { @@ -177,7 +177,7 @@ bool NearbyMenu::enableContextMenuItem(const LLSD& userdata) bool result = (mUUIDs.size() > 0); - std::vector<LLUUID>::const_iterator + uuid_vec_t::const_iterator id = mUUIDs.begin(), uuids_end = mUUIDs.end(); @@ -200,7 +200,7 @@ bool NearbyMenu::enableContextMenuItem(const LLSD& userdata) bool result = (mUUIDs.size() > 0); - std::vector<LLUUID>::const_iterator + uuid_vec_t::const_iterator id = mUUIDs.begin(), uuids_end = mUUIDs.end(); diff --git a/indra/newview/llpanelpeoplemenus.h b/indra/newview/llpanelpeoplemenus.h index 913638d8c8..8e12710afc 100644 --- a/indra/newview/llpanelpeoplemenus.h +++ b/indra/newview/llpanelpeoplemenus.h @@ -52,7 +52,7 @@ public: * * @param uuids - an array of avatar or group ids */ - /*virtual*/ void show(LLView* spawning_view, const std::vector<LLUUID>& uuids, S32 x, S32 y); + /*virtual*/ void show(LLView* spawning_view, const uuid_vec_t& uuids, S32 x, S32 y); virtual void hide(); @@ -60,7 +60,7 @@ protected: virtual LLContextMenu* createMenu() = 0; - std::vector<LLUUID> mUUIDs; + uuid_vec_t mUUIDs; LLContextMenu* mMenu; LLHandle<LLView> mMenuHandle; }; diff --git a/indra/newview/llpanelplaces.cpp b/indra/newview/llpanelplaces.cpp index f9ba6f625d..34cef1bee7 100644 --- a/indra/newview/llpanelplaces.cpp +++ b/indra/newview/llpanelplaces.cpp @@ -1006,9 +1006,9 @@ void LLPanelPlaces::changedGlobalPos(const LLVector3d &global_pos) updateVerbs(); } -void LLPanelPlaces::showAddedLandmarkInfo(const std::vector<LLUUID>& items) +void LLPanelPlaces::showAddedLandmarkInfo(const uuid_vec_t& items) { - for (std::vector<LLUUID>::const_iterator item_iter = items.begin(); + for (uuid_vec_t::const_iterator item_iter = items.begin(); item_iter != items.end(); ++item_iter) { diff --git a/indra/newview/llpanelplaces.h b/indra/newview/llpanelplaces.h index 78fcbbb11d..97cf43d222 100644 --- a/indra/newview/llpanelplaces.h +++ b/indra/newview/llpanelplaces.h @@ -73,7 +73,7 @@ public: void changedGlobalPos(const LLVector3d &global_pos); // Opens landmark info panel when agent creates or receives landmark. - void showAddedLandmarkInfo(const std::vector<LLUUID>& items); + void showAddedLandmarkInfo(const uuid_vec_t& items); void setItem(LLInventoryItem* item); diff --git a/indra/newview/llparticipantlist.cpp b/indra/newview/llparticipantlist.cpp index 2748daaffa..0a20ff6226 100644 --- a/indra/newview/llparticipantlist.cpp +++ b/indra/newview/llparticipantlist.cpp @@ -445,7 +445,7 @@ LLContextMenu* LLParticipantList::LLParticipantListMenu::createMenu() return main_menu; } -void LLParticipantList::LLParticipantListMenu::show(LLView* spawning_view, const std::vector<LLUUID>& uuids, S32 x, S32 y) +void LLParticipantList::LLParticipantListMenu::show(LLView* spawning_view, const uuid_vec_t& uuids, S32 x, S32 y) { LLPanelPeopleMenus::ContextMenu::show(spawning_view, uuids, x, y); @@ -615,7 +615,7 @@ bool LLParticipantList::LLParticipantListMenu::enableContextMenuItem(const LLSD& bool result = (mUUIDs.size() > 0); - std::vector<LLUUID>::const_iterator + uuid_vec_t::const_iterator id = mUUIDs.begin(), uuids_end = mUUIDs.end(); diff --git a/indra/newview/llparticipantlist.h b/indra/newview/llparticipantlist.h index e1b1b5af00..d9ca4230a9 100644 --- a/indra/newview/llparticipantlist.h +++ b/indra/newview/llparticipantlist.h @@ -152,7 +152,7 @@ class LLParticipantList public: LLParticipantListMenu(LLParticipantList& parent):mParent(parent){}; /*virtual*/ LLContextMenu* createMenu(); - /*virtual*/ void show(LLView* spawning_view, const std::vector<LLUUID>& uuids, S32 x, S32 y); + /*virtual*/ void show(LLView* spawning_view, const uuid_vec_t& uuids, S32 x, S32 y); protected: LLParticipantList& mParent; private: diff --git a/indra/newview/llpreview.cpp b/indra/newview/llpreview.cpp index 99e0b82b8f..d5ec3a36c3 100644 --- a/indra/newview/llpreview.cpp +++ b/indra/newview/llpreview.cpp @@ -179,10 +179,9 @@ void LLPreview::onCommit() // update the object itself. if( item->getType() == LLAssetType::AT_OBJECT ) { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if(avatarp) + if (isAgentAvatarValid()) { - LLViewerObject* obj = avatarp->getWornAttachment( item->getUUID() ); + LLViewerObject* obj = gAgentAvatarp->getWornAttachment( item->getUUID() ); if( obj ) { LLSelectMgr::getInstance()->deselectAll(); diff --git a/indra/newview/llpreviewanim.cpp b/indra/newview/llpreviewanim.cpp index 0cc747f789..262961b73b 100644 --- a/indra/newview/llpreviewanim.cpp +++ b/indra/newview/llpreviewanim.cpp @@ -71,7 +71,7 @@ BOOL LLPreviewAnim::postBuild() const LLInventoryItem* item = getItem(); if(item) { - gAgent.getAvatarObject()->createMotion(item->getAssetUUID()); // preload the animation + gAgentAvatarp->createMotion(item->getAssetUUID()); // preload the animation childSetText("desc", item->getDescription()); } @@ -125,10 +125,7 @@ void LLPreviewAnim::playAnim( void *userdata ) { self->mPauseRequest = NULL; gAgent.sendAnimationRequest(itemID, ANIM_REQUEST_START); - - LLVOAvatar* avatar = gAgent.getAvatarObject(); - LLMotion* motion = avatar->findMotion(itemID); - + LLMotion* motion = gAgentAvatarp->findMotion(itemID); if (motion) { motion->setDeactivateCallback(&endAnimCallback, (void *)(new LLHandle<LLFloater>(self->getHandle()))); @@ -136,7 +133,7 @@ void LLPreviewAnim::playAnim( void *userdata ) } else { - gAgent.getAvatarObject()->stopMotion(itemID); + gAgentAvatarp->stopMotion(itemID); gAgent.sendAnimationRequest(itemID, ANIM_REQUEST_STOP); } } @@ -161,10 +158,8 @@ void LLPreviewAnim::auditionAnim( void *userdata ) if (self->childGetValue("Anim audition btn").asBoolean() ) { self->mPauseRequest = NULL; - gAgent.getAvatarObject()->startMotion(item->getAssetUUID()); - - LLVOAvatar* avatar = gAgent.getAvatarObject(); - LLMotion* motion = avatar->findMotion(itemID); + gAgentAvatarp->startMotion(item->getAssetUUID()); + LLMotion* motion = gAgentAvatarp->findMotion(itemID); if (motion) { @@ -173,7 +168,7 @@ void LLPreviewAnim::auditionAnim( void *userdata ) } else { - gAgent.getAvatarObject()->stopMotion(itemID); + gAgentAvatarp->stopMotion(itemID); gAgent.sendAnimationRequest(itemID, ANIM_REQUEST_STOP); } } @@ -186,11 +181,9 @@ void LLPreviewAnim::onClose(bool app_quitting) if(item) { - gAgent.getAvatarObject()->stopMotion(item->getAssetUUID()); + gAgentAvatarp->stopMotion(item->getAssetUUID()); gAgent.sendAnimationRequest(item->getAssetUUID(), ANIM_REQUEST_STOP); - - LLVOAvatar* avatar = gAgent.getAvatarObject(); - LLMotion* motion = avatar->findMotion(item->getAssetUUID()); + LLMotion* motion = gAgentAvatarp->findMotion(item->getAssetUUID()); if (motion) { diff --git a/indra/newview/llpreviewgesture.cpp b/indra/newview/llpreviewgesture.cpp index 57a8ca3d12..aa7b7b8636 100644 --- a/indra/newview/llpreviewgesture.cpp +++ b/indra/newview/llpreviewgesture.cpp @@ -97,7 +97,7 @@ protected: void LLInventoryGestureAvailable::done() { - for(item_ref_t::iterator it = mComplete.begin(); it != mComplete.end(); ++it) + for(uuid_vec_t::iterator it = mComplete.begin(); it != mComplete.end(); ++it) { LLPreviewGesture* preview = LLFloaterReg::findTypedInstance<LLPreviewGesture>("preview_gesture", *it); if(preview) @@ -269,7 +269,7 @@ BOOL LLPreviewGesture::canClose() // virtual void LLPreviewGesture::onClose(bool app_quitting) { - LLGestureManager::instance().stopGesture(mPreviewGesture); + LLGestureMgr::instance().stopGesture(mPreviewGesture); } // virtual @@ -293,13 +293,13 @@ bool LLPreviewGesture::handleSaveChangesDialog(const LLSD& notification, const L switch(option) { case 0: // "Yes" - LLGestureManager::instance().stopGesture(mPreviewGesture); + LLGestureMgr::instance().stopGesture(mPreviewGesture); mCloseAfterSave = TRUE; onClickSave(this); break; case 1: // "No" - LLGestureManager::instance().stopGesture(mPreviewGesture); + LLGestureMgr::instance().stopGesture(mPreviewGesture); mDirty = FALSE; // Force the dirty flag because user has clicked NO on confirm save dialog... closeFloater(); break; @@ -784,7 +784,7 @@ void LLPreviewGesture::refresh() mOptionsText->setText(optionstext); - BOOL active = LLGestureManager::instance().isGestureActive(mItemUUID); + BOOL active = LLGestureMgr::instance().isGestureActive(mItemUUID); mActiveCheck->set(active); // Can only preview if there are steps @@ -1138,10 +1138,10 @@ void LLPreviewGesture::saveIfNeeded() // If this gesture is active, then we need to update the in-memory // active map with the new pointer. - if (!delayedUpload && LLGestureManager::instance().isGestureActive(mItemUUID)) + if (!delayedUpload && LLGestureMgr::instance().isGestureActive(mItemUUID)) { // gesture manager now owns the pointer - LLGestureManager::instance().replaceGesture(mItemUUID, gesture, asset_id); + LLGestureMgr::instance().replaceGesture(mItemUUID, gesture, asset_id); // replaceGesture may deactivate other gestures so let the // inventory know. @@ -1702,13 +1702,13 @@ void LLPreviewGesture::onClickDelete(void* data) void LLPreviewGesture::onCommitActive(LLUICtrl* ctrl, void* data) { LLPreviewGesture* self = (LLPreviewGesture*)data; - if (!LLGestureManager::instance().isGestureActive(self->mItemUUID)) + if (!LLGestureMgr::instance().isGestureActive(self->mItemUUID)) { - LLGestureManager::instance().activateGesture(self->mItemUUID); + LLGestureMgr::instance().activateGesture(self->mItemUUID); } else { - LLGestureManager::instance().deactivateGesture(self->mItemUUID); + LLGestureMgr::instance().deactivateGesture(self->mItemUUID); } // Make sure the (active) label in the inventory gets updated. @@ -1747,14 +1747,14 @@ void LLPreviewGesture::onClickPreview(void* data) self->mPreviewBtn->setLabel(self->getString("stop_txt")); // play it, and delete when done - LLGestureManager::instance().playGesture(self->mPreviewGesture); + LLGestureMgr::instance().playGesture(self->mPreviewGesture); self->refresh(); } else { // Will call onDonePreview() below - LLGestureManager::instance().stopGesture(self->mPreviewGesture); + LLGestureMgr::instance().stopGesture(self->mPreviewGesture); self->refresh(); } diff --git a/indra/newview/llpreviewscript.cpp b/indra/newview/llpreviewscript.cpp index f5a9f82d50..4167408fc3 100644 --- a/indra/newview/llpreviewscript.cpp +++ b/indra/newview/llpreviewscript.cpp @@ -1090,8 +1090,7 @@ void LLPreviewLSL::onSave(void* userdata, BOOL close_after_save) // Save needs to compile the text in the buffer. If the compile // succeeds, then save both assets out to the database. If the compile -// fails, go ahead and save the text anyway so that the user doesn't -// get too fucked. +// fails, go ahead and save the text anyway. void LLPreviewLSL::saveIfNeeded() { // llinfos << "LLPreviewLSL::saveIfNeeded()" << llendl; diff --git a/indra/newview/llrecentpeople.cpp b/indra/newview/llrecentpeople.cpp index bd46b5b56a..62c2ddfd9f 100644 --- a/indra/newview/llrecentpeople.cpp +++ b/indra/newview/llrecentpeople.cpp @@ -63,7 +63,7 @@ bool LLRecentPeople::contains(const LLUUID& id) const return mPeople.find(id) != mPeople.end(); } -void LLRecentPeople::get(std::vector<LLUUID>& result) const +void LLRecentPeople::get(uuid_vec_t& result) const { result.clear(); for (recent_people_t::const_iterator pos = mPeople.begin(); pos != mPeople.end(); ++pos) diff --git a/indra/newview/llrecentpeople.h b/indra/newview/llrecentpeople.h index e0f2faaec5..c718997f7e 100644 --- a/indra/newview/llrecentpeople.h +++ b/indra/newview/llrecentpeople.h @@ -79,7 +79,7 @@ public: * * @param result where to put the result. */ - void get(std::vector<LLUUID>& result) const; + void get(uuid_vec_t& result) const; const LLDate& getDate(const LLUUID& id) const; diff --git a/indra/newview/llscrollingpanelparam.cpp b/indra/newview/llscrollingpanelparam.cpp index 95e12bf46f..7980fe1945 100644 --- a/indra/newview/llscrollingpanelparam.cpp +++ b/indra/newview/llscrollingpanelparam.cpp @@ -209,7 +209,7 @@ void LLScrollingPanelParam::onSliderMoved(LLUICtrl* ctrl, void* userdata) if (current_weight != new_weight ) { self->mWearable->setVisualParamWeight( param->getID(), new_weight, FALSE ); - gAgent.getAvatarObject()->updateVisualParams(); + gAgentAvatarp->updateVisualParams(); } } @@ -298,7 +298,7 @@ void LLScrollingPanelParam::onHintHeldDown( LLVisualParamHint* hint ) && new_percent < slider->getMaxValue()) { mWearable->setVisualParamWeight( hint->getVisualParam()->getID(), new_weight, FALSE); - gAgent.getAvatarObject()->updateVisualParams(); + gAgentAvatarp->updateVisualParams(); slider->setValue( weightToPercent( new_weight ) ); } @@ -344,8 +344,7 @@ void LLScrollingPanelParam::onHintMaxMouseUp( void* userdata ) F32 elapsed_time = self->mMouseDownTimer.getElapsedTimeF32(); - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (avatarp) + if (isAgentAvatarValid()) { LLVisualParamHint* hint = self->mHintMax; diff --git a/indra/newview/llselectmgr.cpp b/indra/newview/llselectmgr.cpp index d744f097d5..d03a492cd1 100644 --- a/indra/newview/llselectmgr.cpp +++ b/indra/newview/llselectmgr.cpp @@ -1475,7 +1475,7 @@ void LLSelectMgr::selectionSetImage(const LLUUID& imageid) object->sendTEUpdate(); // 1 particle effect per object LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE); - effectp->setSourceObject(gAgent.getAvatarObject()); + effectp->setSourceObject(gAgentAvatarp); effectp->setTargetObject(object); effectp->setDuration(LL_HUD_DUR_SHORT); effectp->setColor(LLColor4U(gAgent.getEffectColor())); @@ -3619,7 +3619,7 @@ void LLSelectMgr::sendAttach(U8 attachment_point) { LLViewerObject* attach_object = mSelectedObjects->getFirstRootObject(); - if (!attach_object || !gAgent.getAvatarObject() || mSelectedObjects->mSelectType != SELECT_TYPE_WORLD) + if (!attach_object || !isAgentAvatarValid() || mSelectedObjects->mSelectType != SELECT_TYPE_WORLD) { return; } @@ -3630,7 +3630,7 @@ void LLSelectMgr::sendAttach(U8 attachment_point) BOOL build_mode = LLToolMgr::getInstance()->inEdit(); // Special case: Attach to default location for this object. if (0 == attachment_point || - get_if_there(gAgent.getAvatarObject()->mAttachmentPoints, (S32)attachment_point, (LLViewerJointAttachment*)NULL)) + get_if_there(gAgentAvatarp->mAttachmentPoints, (S32)attachment_point, (LLViewerJointAttachment*)NULL)) { sendListToRegions( "ObjectAttach", @@ -4392,7 +4392,7 @@ void LLSelectMgr::processObjectProperties(LLMessageSystem* msg, void** user_data msg->getStringFast(_PREHASH_ObjectData, _PREHASH_SitName, sit_name, i); //unpack TE IDs - std::vector<LLUUID> texture_ids; + uuid_vec_t texture_ids; S32 size = msg->getSizeFast(_PREHASH_ObjectData, i, _PREHASH_TextureID); if (size > 0) { @@ -4911,10 +4911,9 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud) LLGLEnable blend(GL_BLEND); LLGLDepthTest gls_depth(GL_TRUE, GL_FALSE); - LLVOAvatar* avatar = gAgent.getAvatarObject(); - if (for_hud && avatar) + if (isAgentAvatarValid() && for_hud) { - LLBBox hud_bbox = avatar->getHUDBBox(); + LLBBox hud_bbox = gAgentAvatarp->getHUDBBox(); F32 cur_zoom = gAgentCamera.mHUDCurZoom; @@ -5023,7 +5022,7 @@ void LLSelectMgr::renderSilhouettes(BOOL for_hud) } } - if (for_hud && avatar) + if (isAgentAvatarValid() && for_hud) { glMatrixMode(GL_PROJECTION); gGL.popMatrix(); @@ -5208,13 +5207,13 @@ void LLSelectNode::saveColors() } } -void LLSelectNode::saveTextures(const std::vector<LLUUID>& textures) +void LLSelectNode::saveTextures(const uuid_vec_t& textures) { if (mObject.notNull()) { mSavedTextures.clear(); - for (std::vector<LLUUID>::const_iterator texture_it = textures.begin(); + for (uuid_vec_t::const_iterator texture_it = textures.begin(); texture_it != textures.end(); ++texture_it) { mSavedTextures.push_back(*texture_it); @@ -5399,7 +5398,7 @@ void LLSelectNode::renderOneSilhouette(const LLColor4 &color) if (volume) { F32 silhouette_thickness; - if (is_hud_object && gAgent.getAvatarObject()) + if (isAgentAvatarValid() && is_hud_object) { silhouette_thickness = LLSelectMgr::sHighlightThickness / gAgentCamera.mHUDCurZoom; } @@ -5609,16 +5608,16 @@ void LLSelectMgr::updateSelectionCenter() { mSelectedObjects->mSelectType = getSelectTypeForObject(object); - if (mSelectedObjects->mSelectType == SELECT_TYPE_ATTACHMENT && gAgent.getAvatarObject()) + if (mSelectedObjects->mSelectType == SELECT_TYPE_ATTACHMENT && isAgentAvatarValid()) { - mPauseRequest = gAgent.getAvatarObject()->requestPause(); + mPauseRequest = gAgentAvatarp->requestPause(); } else { mPauseRequest = NULL; } - if (mSelectedObjects->mSelectType != SELECT_TYPE_HUD && gAgent.getAvatarObject()) + if (mSelectedObjects->mSelectType != SELECT_TYPE_HUD && isAgentAvatarValid()) { // reset hud ZOOM gAgentCamera.mHUDTargetZoom = 1.f; @@ -5641,10 +5640,10 @@ void LLSelectMgr::updateSelectionCenter() LLViewerObject* object = node->getObject(); if (!object) continue; - LLViewerObject *myAvatar = gAgent.getAvatarObject(); + LLViewerObject *root = object->getRootEdit(); if (mSelectedObjects->mSelectType == SELECT_TYPE_WORLD && // not an attachment - !root->isChild(myAvatar) && // not the object you're sitting on + !root->isChild(gAgentAvatarp) && // not the object you're sitting on !object->isAvatar()) // not another avatar { mShowSelection = TRUE; diff --git a/indra/newview/llselectmgr.h b/indra/newview/llselectmgr.h index 00474827ca..d315f40ff3 100644 --- a/indra/newview/llselectmgr.h +++ b/indra/newview/llselectmgr.h @@ -147,7 +147,7 @@ public: void setObject(LLViewerObject* object); // *NOTE: invalidate stored textures and colors when # faces change void saveColors(); - void saveTextures(const std::vector<LLUUID>& textures); + void saveTextures(const uuid_vec_t& textures); void saveTextureScaleRatios(); BOOL allowOperationOnNode(PermissionBit op, U64 group_proxy_power) const; @@ -183,7 +183,7 @@ public: std::string mSitName; U64 mCreationDate; std::vector<LLColor4> mSavedColors; - std::vector<LLUUID> mSavedTextures; + uuid_vec_t mSavedTextures; std::vector<LLVector3> mTextureScaleRatios; std::vector<LLVector3> mSilhouetteVertices; // array of vertices to render silhouette of object std::vector<LLVector3> mSilhouetteNormals; // array of normals to render silhouette of object diff --git a/indra/newview/llsidepanelappearance.cpp b/indra/newview/llsidepanelappearance.cpp index 9a37af4916..8364eee09d 100644 --- a/indra/newview/llsidepanelappearance.cpp +++ b/indra/newview/llsidepanelappearance.cpp @@ -206,7 +206,7 @@ void LLSidepanelAppearance::onFilterEdit(const std::string& search_string) void LLSidepanelAppearance::onOpenOutfitButtonClicked() { - const LLViewerInventoryItem *outfit_link = LLAppearanceManager::getInstance()->getBaseOutfitLink(); + const LLViewerInventoryItem *outfit_link = LLAppearanceMgr::getInstance()->getBaseOutfitLink(); if (!outfit_link) return; if (!outfit_link->getIsLinkType()) @@ -320,11 +320,11 @@ void LLSidepanelAppearance::updateVerbs() void LLSidepanelAppearance::refreshCurrentOutfitName(const std::string& name) { - mOutfitDirtyTag->setVisible(LLAppearanceManager::getInstance()->isOutfitDirty()); + mOutfitDirtyTag->setVisible(LLAppearanceMgr::getInstance()->isOutfitDirty()); if (name == "") { std::string outfit_name; - if (LLAppearanceManager::getInstance()->getBaseOutfitName(outfit_name)) + if (LLAppearanceMgr::getInstance()->getBaseOutfitName(outfit_name)) { mCurrentLookName->setText(outfit_name); return; @@ -366,11 +366,10 @@ void LLSidepanelAppearance::fetchInventory() } } - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if(avatarp) + if (isAgentAvatarValid()) { - for (LLVOAvatar::attachment_map_t::const_iterator iter = avatarp->mAttachmentPoints.begin(); - iter != avatarp->mAttachmentPoints.end(); ++iter) + for (LLVOAvatar::attachment_map_t::const_iterator iter = gAgentAvatarp->mAttachmentPoints.begin(); + iter != gAgentAvatarp->mAttachmentPoints.end(); ++iter) { LLViewerJointAttachment* attachment = iter->second; if (!attachment) continue; diff --git a/indra/newview/llspeakers.cpp b/indra/newview/llspeakers.cpp index 6cf9c6b95d..4573520647 100644 --- a/indra/newview/llspeakers.cpp +++ b/indra/newview/llspeakers.cpp @@ -879,7 +879,7 @@ void LLLocalSpeakerMgr::updateSpeakerList() } // pick up non-voice speakers in chat range - std::vector<LLUUID> avatar_ids; + uuid_vec_t avatar_ids; std::vector<LLVector3d> positions; LLWorld::getInstance()->getAvatars(&avatar_ids, &positions, gAgent.getPositionGlobal(), CHAT_NORMAL_RADIUS); for(U32 i=0; i<avatar_ids.size(); i++) diff --git a/indra/newview/llstartup.cpp b/indra/newview/llstartup.cpp index 59d118abe2..d75a1424d2 100644 --- a/indra/newview/llstartup.cpp +++ b/indra/newview/llstartup.cpp @@ -1746,7 +1746,7 @@ bool idle_startup() { LL_DEBUGS("AppInit") << "Gesture Manager loading " << gesture_options.size() << LL_ENDL; - std::vector<LLUUID> item_ids; + uuid_vec_t item_ids; for(LLSD::array_const_iterator resp_it = gesture_options.beginArray(), end = gesture_options.endArray(); resp_it != end; ++resp_it) { @@ -1760,7 +1760,7 @@ bool idle_startup() // Could schedule and delay these for later. const BOOL no_inform_server = FALSE; const BOOL no_deactivate_similar = FALSE; - LLGestureManager::instance().activateGestureWithAsset(item_id, asset_id, + LLGestureMgr::instance().activateGestureWithAsset(item_id, asset_id, no_inform_server, no_deactivate_similar); // We need to fetch the inventory items for these gestures @@ -1769,7 +1769,7 @@ bool idle_startup() } } // no need to add gesture to inventory observer, it's already made in constructor - LLGestureManager::instance().fetchItems(item_ids); + LLGestureMgr::instance().fetchItems(item_ids); } } gDisplaySwapBuffers = TRUE; @@ -1864,7 +1864,7 @@ bool idle_startup() if (gAgent.isFirstLogin() && !sInitialOutfit.empty() // registration set up an outfit && !sInitialOutfitGender.empty() // and a gender - && gAgent.getAvatarObject() // can't wear clothes without object + && isAgentAvatarValid() // can't wear clothes without object && !gAgent.isGenderChosen() ) // nothing already loading { // Start loading the wearables, textures, gestures @@ -1872,7 +1872,7 @@ bool idle_startup() } // wait precache-delay and for agent's avatar or a lot longer. - if(((timeout_frac > 1.f) && gAgent.getAvatarObject()) + if(((timeout_frac > 1.f) && isAgentAvatarValid()) || (timeout_frac > 3.f)) { LLStartUp::setStartupState( STATE_WEARABLES_WAIT ); @@ -1928,8 +1928,8 @@ bool idle_startup() if (gAgent.isFirstLogin()) { // wait for avatar to be completely loaded - if (gAgent.getAvatarObject() - && gAgent.getAvatarObject()->isFullyLoaded()) + if (isAgentAvatarValid() + && gAgentAvatarp->isFullyLoaded()) { //llinfos << "avatar fully loaded" << llendl; LLStartUp::setStartupState( STATE_CLEANUP ); @@ -2536,7 +2536,7 @@ void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name, llinfos << "starting" << llendl; // Not going through the processAgentInitialWearables path, so need to set this here. - LLAppearanceManager::instance().setAttachmentInvLinkEnable(true); + LLAppearanceMgr::instance().setAttachmentInvLinkEnable(true); // Initiate creation of COF, since we're also bypassing that. gInventory.findCategoryUUIDForType(LLFolderType::FT_CURRENT_OUTFIT); @@ -2567,13 +2567,13 @@ void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name, bool do_copy = true; bool do_append = false; LLViewerInventoryCategory *cat = gInventory.getCategory(cat_id); - LLAppearanceManager::instance().wearInventoryCategory(cat, do_copy, do_append); + LLAppearanceMgr::instance().wearInventoryCategory(cat, do_copy, do_append); } // Copy gestures LLUUID dst_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_GESTURE); LLPointer<LLInventoryCallback> cb(NULL); - LLAppearanceManager *app_mgr = &(LLAppearanceManager::instance()); + LLAppearanceMgr *app_mgr = &(LLAppearanceMgr::instance()); // - Copy gender-specific gestures. LLUUID gestures_cat_id = findDescendentCategoryIDByName( @@ -2582,7 +2582,7 @@ void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name, if (gestures_cat_id.notNull()) { callAfterCategoryFetch(gestures_cat_id, - boost::bind(&LLAppearanceManager::shallowCopyCategory, + boost::bind(&LLAppearanceMgr::shallowCopyCategory, app_mgr, gestures_cat_id, dst_id, @@ -2596,7 +2596,7 @@ void LLStartUp::loadInitialOutfit( const std::string& outfit_folder_name, if (common_gestures_cat_id.notNull()) { callAfterCategoryFetch(common_gestures_cat_id, - boost::bind(&LLAppearanceManager::shallowCopyCategory, + boost::bind(&LLAppearanceMgr::shallowCopyCategory, app_mgr, common_gestures_cat_id, dst_id, diff --git a/indra/newview/llstatusbar.cpp b/indra/newview/llstatusbar.cpp index 3052134d4f..58f64ff1f3 100644 --- a/indra/newview/llstatusbar.cpp +++ b/indra/newview/llstatusbar.cpp @@ -445,11 +445,9 @@ void LLStatusBar::setHealth(S32 health) { if (mHealth > (health + gSavedSettings.getF32("UISndHealthReductionThreshold"))) { - LLVOAvatar *me; - - if ((me = gAgent.getAvatarObject())) + if (isAgentAvatarValid()) { - if (me->getSex() == SEX_FEMALE) + if (gAgentAvatarp->getSex() == SEX_FEMALE) { make_ui_sound("UISndHealthReductionF"); } diff --git a/indra/newview/lltexlayer.cpp b/indra/newview/lltexlayer.cpp index 21c928282a..3f4dab4fea 100644 --- a/indra/newview/lltexlayer.cpp +++ b/indra/newview/lltexlayer.cpp @@ -284,8 +284,6 @@ void LLTexLayerSetBuffer::readBackAndUpload() llinfos << "Baked " << mTexLayerSet->getBodyRegion() << llendl; LLViewerStats::getInstance()->incStat(LLViewerStats::ST_TEX_BAKES); - llassert( gAgent.getAvatarObject() == mTexLayerSet->getAvatar() ); - // We won't need our caches since we're baked now. (Techically, we won't // really be baked until this image is sent to the server and the Avatar // Appearance message is received.) @@ -352,7 +350,7 @@ void LLTexLayerSetBuffer::readBackAndUpload() { // baked_upload_data is owned by the responder and deleted after the request completes LLBakedUploadData* baked_upload_data = - new LLBakedUploadData(gAgent.getAvatarObject(), this->mTexLayerSet, asset_id); + new LLBakedUploadData(gAgentAvatarp, this->mTexLayerSet, asset_id); mUploadID = asset_id; // upload the image @@ -409,12 +407,10 @@ void LLTexLayerSetBuffer::onTextureUploadComplete(const LLUUID& uuid, { LLBakedUploadData* baked_upload_data = (LLBakedUploadData*)userdata; - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (0 == result && - avatarp && - !avatarp->isDead() && - baked_upload_data->mAvatar == avatarp && // Sanity check: only the user's avatar should be uploading textures. + isAgentAvatarValid() && + !gAgentAvatarp->isDead() && + baked_upload_data->mAvatar == gAgentAvatarp && // Sanity check: only the user's avatar should be uploading textures. baked_upload_data->mTexLayerSet->hasComposite() ) { @@ -439,11 +435,11 @@ void LLTexLayerSetBuffer::onTextureUploadComplete(const LLUUID& uuid, if (result >= 0) { - LLVOAvatarDefines::ETextureIndex baked_te = avatarp->getBakedTE(layerset_buffer->mTexLayerSet); + LLVOAvatarDefines::ETextureIndex baked_te = gAgentAvatarp->getBakedTE(layerset_buffer->mTexLayerSet); // Update baked texture info with the new UUID U64 now = LLFrameTimer::getTotalTime(); // Record starting time llinfos << "Baked texture upload took " << (S32)((now - baked_upload_data->mStartTime) / 1000) << " ms" << llendl; - avatarp->setNewBakedTexture(baked_te, uuid); + gAgentAvatarp->setNewBakedTexture(baked_te, uuid); } else { @@ -457,7 +453,7 @@ void LLTexLayerSetBuffer::onTextureUploadComplete(const LLUUID& uuid, llinfos << "Received baked texture out of date, ignored." << llendl; } - avatarp->dirtyMesh(); + gAgentAvatarp->dirtyMesh(); } else { diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp index 7a0712f8aa..08bc8220d9 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -852,8 +852,8 @@ bool LLTextureCache::updateTextureEntryList(const LLUUID& id, S32 bodysize) } else if (oldbodysize != entry.mBodySize) { - // TODO: change to llwarns - llerrs << "Entry mismatch in mTextureSizeMap / mHeaderIDMap" + // only happens to 64 bits systems, do not know why. + llwarns << "Entry mismatch in mTextureSizeMap / mHeaderIDMap" << " idx=" << idx << " oldsize=" << oldbodysize << " entrysize=" << entry.mBodySize << llendl; } updateEntry(idx, entry, entry.mImageSize, bodysize); @@ -1221,9 +1221,17 @@ U32 LLTextureCache::openAndReadEntries(std::vector<Entry>& entries) mFreeList.clear(); mTexturesSizeTotal = 0; - LLAPRFile* aprfile = openHeaderEntriesFile(true, 0); - updatedHeaderEntriesFile() ; - aprfile->seek(APR_SET, (S32)sizeof(EntriesInfo)); + LLAPRFile* aprfile = NULL; + if(mUpdatedEntryMap.empty()) + { + aprfile = openHeaderEntriesFile(true, (S32)sizeof(EntriesInfo)); + } + else //update the header file first. + { + aprfile = openHeaderEntriesFile(false, 0); + updatedHeaderEntriesFile() ; + aprfile->seek(APR_SET, (S32)sizeof(EntriesInfo)); + } for (U32 idx=0; idx<num_entries; idx++) { Entry entry; diff --git a/indra/newview/lltooldraganddrop.cpp b/indra/newview/lltooldraganddrop.cpp index 813b3bd22f..4f5eeb254b 100644 --- a/indra/newview/lltooldraganddrop.cpp +++ b/indra/newview/lltooldraganddrop.cpp @@ -80,7 +80,7 @@ public: virtual bool operator()(LLInventoryCategory* cat, LLInventoryItem* item) { - if(cat && (cat->getPreferredType() == LLFolderType::FT_NONE)) + if (cat && (cat->getPreferredType() == LLFolderType::FT_NONE)) { return true; } @@ -96,8 +96,8 @@ public: virtual bool operator()(LLInventoryCategory* cat, LLInventoryItem* item) { - if(item) return true; - if(cat && (cat->getPreferredType() == LLFolderType::FT_NONE)) + if (item) return true; + if (cat && (cat->getPreferredType() == LLFolderType::FT_NONE)) { return true; } @@ -124,18 +124,18 @@ bool LLDroppableItem::operator()(LLInventoryCategory* cat, LLInventoryItem* item) { bool allowed = false; - if(item) + if (item) { allowed = itemTransferCommonlyAllowed(item); - if(allowed + if (allowed && mIsTransfer && !item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID())) { allowed = false; } - if(allowed && !item->getPermissions().allowCopyBy(gAgent.getID())) + if (allowed && !item->getPermissions().allowCopyBy(gAgent.getID())) { ++mCountLosing; } @@ -155,7 +155,7 @@ bool LLUncopyableItems::operator()(LLInventoryCategory* cat, LLInventoryItem* item) { bool uncopyable = false; - if(item) + if (item) { if (itemTransferCommonlyAllowed(item) && !item->getPermissions().allowCopyBy(gAgent.getID())) @@ -180,10 +180,10 @@ bool LLDropCopyableItems::operator()( LLInventoryItem* item) { bool allowed = false; - if(item) + if (item) { allowed = itemTransferCommonlyAllowed(item); - if(allowed && + if (allowed && !item->getPermissions().allowCopyBy(gAgent.getID())) { // whoops, can't copy it - don't allow it. @@ -212,16 +212,16 @@ bool LLGiveable::operator()(LLInventoryCategory* cat, LLInventoryItem* item) return true; bool allowed = false; - if(item) + if (item) { allowed = itemTransferCommonlyAllowed(item); - if(allowed && + if (allowed && !item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID())) { allowed = FALSE; } - if(allowed && + if (allowed && !item->getPermissions().allowCopyBy(gAgent.getID())) { ++mCountLosing; @@ -262,7 +262,7 @@ void LLCategoryDropObserver::done() { gInventory.removeObserver(this); LLViewerObject* dst_obj = gObjectList.findObject(mObjectID); - if(dst_obj) + if (dst_obj) { // *FIX: coalesce these... LLInventoryItem* item = NULL; @@ -271,7 +271,7 @@ void LLCategoryDropObserver::done() for(; it < end; ++it) { item = gInventory.getItem(*it); - if(item) + if (item) { LLToolDragAndDrop::dropInventory( dst_obj, @@ -304,8 +304,8 @@ void LLCategoryDropDescendentsObserver::done() { gInventory.removeObserver(this); - folder_ref_t::iterator it = mCompleteFolders.begin(); - folder_ref_t::iterator end = mCompleteFolders.end(); + uuid_vec_t::iterator it = mCompleteFolders.begin(); + uuid_vec_t::iterator end = mCompleteFolders.end(); LLViewerInventoryCategory::cat_array_t cats; LLViewerInventoryItem::item_array_t items; for(; it != end; ++it) @@ -318,7 +318,7 @@ void LLCategoryDropDescendentsObserver::done() } S32 count = items.count(); - if(count) + if (count) { std::set<LLUUID> unique_ids; for(S32 i = 0; i < count; ++i) @@ -331,7 +331,7 @@ void LLCategoryDropDescendentsObserver::done() LLCategoryDropObserver* dropper; dropper = new LLCategoryDropObserver(mObjectID, mSource); dropper->fetchItems(ids); - if(dropper->isEverythingComplete()) + if (dropper->isEverythingComplete()) { dropper->done(); } @@ -422,7 +422,7 @@ void LLToolDragAndDrop::beginDrag(EDragAndDropType type, const LLUUID& source_id, const LLUUID& object_id) { - if(type == DAD_NONE) + if (type == DAD_NONE) { llwarns << "Attempted to start drag without a cargo type" << llendl; return; @@ -438,24 +438,24 @@ void LLToolDragAndDrop::beginDrag(EDragAndDropType type, setMouseCapture( TRUE ); LLToolMgr::getInstance()->setTransientTool( this ); mCursor = UI_CURSOR_NO; - if((mCargoTypes[0] == DAD_CATEGORY) + if ((mCargoTypes[0] == DAD_CATEGORY) && ((mSource == SOURCE_AGENT) || (mSource == SOURCE_LIBRARY))) { LLInventoryCategory* cat = gInventory.getCategory(cargo_id); // go ahead and fire & forget the descendents if we are not // dragging a protected folder. - if(cat) + if (cat) { LLViewerInventoryCategory::cat_array_t cats; LLViewerInventoryItem::item_array_t items; LLNoPreferredTypeOrItem is_not_preferred; - LLInventoryFetchComboObserver::folder_ref_t folder_ids; - LLInventoryFetchComboObserver::item_ref_t item_ids; - if(is_not_preferred(cat, NULL)) + uuid_vec_t folder_ids; + uuid_vec_t item_ids; + if (is_not_preferred(cat, NULL)) { folder_ids.push_back(cargo_id); } - gInventory.collectDescendentsIf( + gInventory.collectDescendentsIf ( cargo_id, cats, items, @@ -472,7 +472,7 @@ void LLToolDragAndDrop::beginDrag(EDragAndDropType type, { item_ids.push_back(items.get(i)->getUUID()); } - if(!folder_ids.empty() || !item_ids.empty()) + if (!folder_ids.empty() || !item_ids.empty()) { LLCategoryFireAndForget fetcher; fetcher.fetch(folder_ids, item_ids); @@ -483,7 +483,7 @@ void LLToolDragAndDrop::beginDrag(EDragAndDropType type, void LLToolDragAndDrop::beginMultiDrag( const std::vector<EDragAndDropType> types, - const std::vector<LLUUID>& cargo_ids, + const uuid_vec_t& cargo_ids, ESource source, const LLUUID& source_id) { @@ -493,7 +493,7 @@ void LLToolDragAndDrop::beginMultiDrag( std::vector<EDragAndDropType>::const_iterator types_it; for (types_it = types.begin(); types_it != types.end(); ++types_it) { - if(DAD_NONE == *types_it) + if (DAD_NONE == *types_it) { llwarns << "Attempted to start drag without a cargo type" << llendl; return; @@ -507,7 +507,7 @@ void LLToolDragAndDrop::beginMultiDrag( setMouseCapture( TRUE ); LLToolMgr::getInstance()->setTransientTool( this ); mCursor = UI_CURSOR_NO; - if((mSource == SOURCE_AGENT) || (mSource == SOURCE_LIBRARY)) + if ((mSource == SOURCE_AGENT) || (mSource == SOURCE_LIBRARY)) { // find categories (i.e. inventory folders) in the cargo. LLInventoryCategory* cat = NULL; @@ -516,16 +516,16 @@ void LLToolDragAndDrop::beginMultiDrag( for(S32 i = 0; i < count; ++i) { cat = gInventory.getCategory(cargo_ids[i]); - if(cat) + if (cat) { LLViewerInventoryCategory::cat_array_t cats; LLViewerInventoryItem::item_array_t items; LLNoPreferredType is_not_preferred; - if(is_not_preferred(cat, NULL)) + if (is_not_preferred(cat, NULL)) { cat_ids.insert(cat->getUUID()); } - gInventory.collectDescendentsIf( + gInventory.collectDescendentsIf ( cat->getUUID(), cats, items, @@ -538,11 +538,11 @@ void LLToolDragAndDrop::beginMultiDrag( } } } - if(!cat_ids.empty()) + if (!cat_ids.empty()) { - LLInventoryFetchComboObserver::folder_ref_t folder_ids; - LLInventoryFetchComboObserver::item_ref_t item_ids; - std::back_insert_iterator<LLInventoryFetchDescendentsObserver::folder_ref_t> copier(folder_ids); + uuid_vec_t folder_ids; + uuid_vec_t item_ids; + std::back_insert_iterator<uuid_vec_t> copier(folder_ids); std::copy(cat_ids.begin(), cat_ids.end(), copier); LLCategoryFireAndForget fetcher; fetcher.fetch(folder_ids, item_ids); @@ -570,7 +570,7 @@ void LLToolDragAndDrop::onMouseCaptureLost() BOOL LLToolDragAndDrop::handleMouseUp( S32 x, S32 y, MASK mask ) { - if( hasMouseCapture() ) + if (hasMouseCapture()) { EAcceptance acceptance = ACCEPT_NO; dragOrDrop( x, y, mask, TRUE, &acceptance ); @@ -581,7 +581,7 @@ BOOL LLToolDragAndDrop::handleMouseUp( S32 x, S32 y, MASK mask ) ECursorType LLToolDragAndDrop::acceptanceToCursor( EAcceptance acceptance ) { - switch( acceptance ) + switch (acceptance) { case ACCEPT_YES_MULTI: if (mCargoIDs.size() > 1) @@ -698,7 +698,7 @@ void LLToolDragAndDrop::dragOrDrop( S32 x, S32 y, MASK mask, BOOL drop, mToolTipMsg.clear(); - if(top_view) + if (top_view) { handled = TRUE; @@ -763,7 +763,7 @@ void LLToolDragAndDrop::dragOrDrop( S32 x, S32 y, MASK mask, BOOL drop, } } - if(!handled) + if (!handled) { handled = TRUE; @@ -821,7 +821,7 @@ void LLToolDragAndDrop::dragOrDrop( S32 x, S32 y, MASK mask, BOOL drop, } } - if ( !handled ) + if (!handled) { dragOrDrop3D( x, y, mask, drop, acceptance ); } @@ -874,7 +874,7 @@ void LLToolDragAndDrop::pick(const LLPickInfo& pick_info) if (hit_obj->isAttachment() && !hit_obj->isHUDAttachment()) { LLVOAvatar* avatar = LLVOAvatar::findAvatarFromAttachment( hit_obj ); - if( !avatar ) + if (!avatar) { mLastAccept = ACCEPT_NO; mCursor = UI_CURSOR_NO; @@ -886,7 +886,7 @@ void LLToolDragAndDrop::pick(const LLPickInfo& pick_info) if (hit_obj->isAvatar()) { - if(((LLVOAvatar*) hit_obj)->isSelf()) + if (((LLVOAvatar*) hit_obj)->isSelf()) { target = DT_SELF; hit_face = -1; @@ -972,7 +972,7 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj, // Always succeed if.... // texture is from the library // or already in the contents of the object - if(SOURCE_LIBRARY == source) + if (SOURCE_LIBRARY == source) { // dropping a texture from the library always just works. return TRUE; @@ -1000,7 +1000,7 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj, if (!item) return FALSE; LLPointer<LLViewerInventoryItem> new_item = new LLViewerInventoryItem(item); - if(!item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID())) + if (!item->getPermissions().allowOperationBy(PERM_COPY, gAgent.getID())) { // Check that we can add the texture as inventory to the object if (willObjectAcceptInventory(hit_obj,item) < ACCEPT_YES_COPY_SINGLE ) @@ -1008,20 +1008,20 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj, return FALSE; } // make sure the object has the texture in it's inventory. - if(SOURCE_AGENT == source) + if (SOURCE_AGENT == source) { // Remove the texture from local inventory. The server // will actually remove the item from agent inventory. gInventory.deleteObject(item->getUUID()); gInventory.notifyObservers(); } - else if(SOURCE_WORLD == source) + else if (SOURCE_WORLD == source) { // *FIX: if the objects are in different regions, and the // source region has crashed, you can bypass these // permissions. LLViewerObject* src_obj = gObjectList.findObject(src_id); - if(src_obj) + if (src_obj) { src_obj->removeInventory(item->getUUID()); } @@ -1036,7 +1036,7 @@ BOOL LLToolDragAndDrop::handleDropTextureProtections(LLViewerObject* hit_obj, // TODO: Check to see if adding the item was successful; if not, then // we should return false here. } - else if(!item->getPermissions().allowOperationBy(PERM_TRANSFER, + else if (!item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID())) { // Check that we can add the texture as inventory to the object @@ -1068,7 +1068,7 @@ void LLToolDragAndDrop::dropTextureAllFaces(LLViewerObject* hit_obj, } LLUUID asset_id = item->getAssetUUID(); BOOL success = handleDropTextureProtections(hit_obj, item, source, src_id); - if(!success) + if (!success) { return; } @@ -1110,7 +1110,7 @@ void LLToolDragAndDrop::dropTextureOneFace(LLViewerObject* hit_obj, } LLUUID asset_id = item->getAssetUUID(); BOOL success = handleDropTextureProtections(hit_obj, item, source, src_id); - if(!success) + if (!success) { return; } @@ -1133,32 +1133,32 @@ void LLToolDragAndDrop::dropScript(LLViewerObject* hit_obj, { // *HACK: In order to resolve SL-22177, we need to block drags // from notecards and objects onto other objects. - if((SOURCE_WORLD == LLToolDragAndDrop::getInstance()->mSource) + if ((SOURCE_WORLD == LLToolDragAndDrop::getInstance()->mSource) || (SOURCE_NOTECARD == LLToolDragAndDrop::getInstance()->mSource)) { llwarns << "Call to LLToolDragAndDrop::dropScript() from world" << " or notecard." << llendl; return; } - if(hit_obj && item) + if (hit_obj && item) { LLPointer<LLViewerInventoryItem> new_script = new LLViewerInventoryItem(item); - if(!item->getPermissions().allowCopyBy(gAgent.getID())) + if (!item->getPermissions().allowCopyBy(gAgent.getID())) { - if(SOURCE_AGENT == source) + if (SOURCE_AGENT == source) { // Remove the script from local inventory. The server // will actually remove the item from agent inventory. gInventory.deleteObject(item->getUUID()); gInventory.notifyObservers(); } - else if(SOURCE_WORLD == source) + else if (SOURCE_WORLD == source) { // *FIX: if the objects are in different regions, and // the source region has crashed, you can bypass // these permissions. LLViewerObject* src_obj = gObjectList.findObject(src_id); - if(src_obj) + if (src_obj) { src_obj->removeInventory(item->getUUID()); } @@ -1174,7 +1174,7 @@ void LLToolDragAndDrop::dropScript(LLViewerObject* hit_obj, // VEFFECT: SetScript LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE); - effectp->setSourceObject(gAgent.getAvatarObject()); + effectp->setSourceObject(gAgentAvatarp); effectp->setTargetObject(hit_obj); effectp->setDuration(LL_HUD_DUR_SHORT); effectp->setColor(LLColor4U(gAgent.getEffectColor())); @@ -1198,7 +1198,7 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target, LLViewerInventoryItem* item; LLViewerInventoryCategory* cat; locateInventory(item, cat); - if(!item || !item->isComplete()) return; + if (!item || !item->isComplete()) return; //if (regionp // && (regionp->getRegionFlags() & REGION_FLAGS_SANDBOX)) @@ -1209,7 +1209,7 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target, // this will remove the object from inventory after rez. Only // bother with this check if we would not normally remove from // inventory. - if(!remove_from_inventory + if (!remove_from_inventory && !item->getPermissions().allowCopyBy(gAgent.getID())) { remove_from_inventory = TRUE; @@ -1220,7 +1220,7 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target, // hitting objects that were clipped by the near plane or culled // on the viewer. LLUUID ray_target_id; - if( raycast_target ) + if (raycast_target) { ray_target_id = raycast_target->getID(); } @@ -1232,7 +1232,7 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target, // Check if it's in the trash. bool is_in_trash = false; const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH); - if(gInventory.isObjectDescendentOf(item->getUUID(), trash_id)) + if (gInventory.isObjectDescendentOf(item->getUUID(), trash_id)) { is_in_trash = true; remove_from_inventory = TRUE; @@ -1290,7 +1290,7 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target, pack_permissions_slam(msg, item->getFlags(), item->getPermissions()); LLUUID folder_id = item->getParentUUID(); - if((SOURCE_LIBRARY == mSource) || (is_in_trash)) + if ((SOURCE_LIBRARY == mSource) || (is_in_trash)) { // since it's coming from the library or trash, we want to not // 'take' it back to the same place. @@ -1324,7 +1324,7 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target, gViewerWindow->getWindow()->incBusyCount(); } - if(remove_from_inventory) + if (remove_from_inventory) { // Delete it from inventory immediately so that users cannot // easily bypass copy protection in laggy situations. If the @@ -1335,7 +1335,7 @@ void LLToolDragAndDrop::dropObject(LLViewerObject* raycast_target, // VEFFECT: DropObject LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE); - effectp->setSourceObject(gAgent.getAvatarObject()); + effectp->setSourceObject(gAgentAvatarp); effectp->setPositionGlobal(mLastHitPos); effectp->setDuration(LL_HUD_DUR_SHORT); effectp->setColor(LLColor4U(gAgent.getEffectColor())); @@ -1350,7 +1350,7 @@ void LLToolDragAndDrop::dropInventory(LLViewerObject* hit_obj, { // *HACK: In order to resolve SL-22177, we need to block drags // from notecards and objects onto other objects. - if((SOURCE_WORLD == LLToolDragAndDrop::getInstance()->mSource) + if ((SOURCE_WORLD == LLToolDragAndDrop::getInstance()->mSource) || (SOURCE_NOTECARD == LLToolDragAndDrop::getInstance()->mSource)) { llwarns << "Call to LLToolDragAndDrop::dropInventory() from world" @@ -1362,9 +1362,9 @@ void LLToolDragAndDrop::dropInventory(LLViewerObject* hit_obj, time_t creation_date = time_corrected(); new_item->setCreationDate(creation_date); - if(!item->getPermissions().allowCopyBy(gAgent.getID())) + if (!item->getPermissions().allowCopyBy(gAgent.getID())) { - if(SOURCE_AGENT == source) + if (SOURCE_AGENT == source) { // Remove the inventory item from local inventory. The // server will actually remove the item from agent @@ -1372,13 +1372,13 @@ void LLToolDragAndDrop::dropInventory(LLViewerObject* hit_obj, gInventory.deleteObject(item->getUUID()); gInventory.notifyObservers(); } - else if(SOURCE_WORLD == source) + else if (SOURCE_WORLD == source) { // *FIX: if the objects are in different regions, and the // source region has crashed, you can bypass these // permissions. LLViewerObject* src_obj = gObjectList.findObject(src_id); - if(src_obj) + if (src_obj) { src_obj->removeInventory(item->getUUID()); } @@ -1398,7 +1398,7 @@ void LLToolDragAndDrop::dropInventory(LLViewerObject* hit_obj, // VEFFECT: AddToInventory LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE); - effectp->setSourceObject(gAgent.getAvatarObject()); + effectp->setSourceObject(gAgentAvatarp); effectp->setTargetObject(hit_obj); effectp->setDuration(LL_HUD_DUR_SHORT); effectp->setColor(LLColor4U(gAgent.getEffectColor())); @@ -1411,11 +1411,11 @@ void LLToolDragAndDrop::giveInventory(const LLUUID& to_agent, { llinfos << "LLToolDragAndDrop::giveInventory()" << llendl; - if(!isInventoryGiveAcceptable(item)) + if (!isInventoryGiveAcceptable(item)) { return; } - if(item->getPermissions().allowCopyBy(gAgent.getID())) + if (item->getPermissions().allowCopyBy(gAgent.getID())) { // just give it away. LLToolDragAndDrop::commitGiveInventoryItem(to_agent, item, im_session_id); @@ -1439,7 +1439,7 @@ bool LLToolDragAndDrop::handleCopyProtectedItem(const LLSD& notification, const { case 0: // "Yes" item = gInventory.getItem(notification["payload"]["item_id"].asUUID()); - if(item) + if (item) { LLToolDragAndDrop::commitGiveInventoryItem(notification["payload"]["agent_id"].asUUID(), item); @@ -1466,7 +1466,7 @@ void LLToolDragAndDrop::commitGiveInventoryItem(const LLUUID& to_agent, LLInventoryItem* item, const LLUUID& im_session_id) { - if(!item) return; + if (!item) return; std::string name; LLAgentUI::buildFullname(name); LLUUID transaction_id; @@ -1496,7 +1496,7 @@ void LLToolDragAndDrop::commitGiveInventoryItem(const LLUUID& to_agent, // VEFFECT: giveInventory LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE); - effectp->setSourceObject(gAgent.getAvatarObject()); + effectp->setSourceObject(gAgentAvatarp); effectp->setTargetObject(gObjectList.findObject(to_agent)); effectp->setDuration(LL_HUD_DUR_SHORT); effectp->setColor(LLColor4U(gAgent.getEffectColor())); @@ -1543,21 +1543,17 @@ void LLToolDragAndDrop::giveInventoryCategory(const LLUUID& to_agent, const LLUUID& im_session_id) { - if(!cat) return; + if (!cat) return; llinfos << "LLToolDragAndDrop::giveInventoryCategory() - " << cat->getUUID() << llendl; - LLVOAvatar* my_avatar = gAgent.getAvatarObject(); - if( !my_avatar ) - { - return; - } + if (!isAgentAvatarValid()) return; // Test out how many items are being given. LLViewerInventoryCategory::cat_array_t cats; LLViewerInventoryItem::item_array_t items; LLGiveable giveable; - gInventory.collectDescendentsIf(cat->getUUID(), + gInventory.collectDescendentsIf (cat->getUUID(), cats, items, LLInventoryModel::EXCLUDE_TRASH, @@ -1566,31 +1562,31 @@ void LLToolDragAndDrop::giveInventoryCategory(const LLUUID& to_agent, bool complete = true; for(S32 i = 0; i < count; ++i) { - if(!gInventory.isCategoryComplete(cats.get(i)->getUUID())) + if (!gInventory.isCategoryComplete(cats.get(i)->getUUID())) { complete = false; break; } } - if(!complete) + if (!complete) { LLNotificationsUtil::add("IncompleteInventory"); return; } count = items.count() + cats.count(); - if(count > MAX_ITEMS) + if (count > MAX_ITEMS) { LLNotificationsUtil::add("TooManyItems"); return; } - else if(count == 0) + else if (count == 0) { LLNotificationsUtil::add("NoItems"); return; } else { - if(0 == giveable.countNoCopy()) + if (0 == giveable.countNoCopy()) { LLToolDragAndDrop::commitGiveInventoryCategory(to_agent, cat, im_session_id); } @@ -1616,14 +1612,14 @@ bool LLToolDragAndDrop::handleCopyProtectedCategory(const LLSD& notification, co { case 0: // "Yes" cat = gInventory.getCategory(notification["payload"]["folder_id"].asUUID()); - if(cat) + if (cat) { LLToolDragAndDrop::commitGiveInventoryCategory(notification["payload"]["agent_id"].asUUID(), cat); LLViewerInventoryCategory::cat_array_t cats; LLViewerInventoryItem::item_array_t items; LLUncopyableItems remove; - gInventory.collectDescendentsIf(cat->getUUID(), + gInventory.collectDescendentsIf (cat->getUUID(), cats, items, LLInventoryModel::EXCLUDE_TRASH, @@ -1654,7 +1650,7 @@ void LLToolDragAndDrop::commitGiveInventoryCategory(const LLUUID& to_agent, const LLUUID& im_session_id) { - if(!cat) return; + if (!cat) return; llinfos << "LLToolDragAndDrop::commitGiveInventoryCategory() - " << cat->getUUID() << llendl; @@ -1665,7 +1661,7 @@ void LLToolDragAndDrop::commitGiveInventoryCategory(const LLUUID& to_agent, LLViewerInventoryCategory::cat_array_t cats; LLViewerInventoryItem::item_array_t items; LLGiveable giveable; - gInventory.collectDescendentsIf(cat->getUUID(), + gInventory.collectDescendentsIf (cat->getUUID(), cats, items, LLInventoryModel::EXCLUDE_TRASH, @@ -1675,12 +1671,12 @@ void LLToolDragAndDrop::commitGiveInventoryCategory(const LLUUID& to_agent, // MTUBYTES or 18 * count < 1200 => count < 1200/18 => // 66. I've cut it down a bit from there to give some pad. S32 count = items.count() + cats.count(); - if(count > MAX_ITEMS) + if (count > MAX_ITEMS) { LLNotificationsUtil::add("TooManyItems"); return; } - else if(count == 0) + else if (count == 0) { LLNotificationsUtil::add("NoItems"); return; @@ -1739,7 +1735,7 @@ void LLToolDragAndDrop::commitGiveInventoryCategory(const LLUUID& to_agent, // VEFFECT: giveInventoryCategory LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE); - effectp->setSourceObject(gAgent.getAvatarObject()); + effectp->setSourceObject(gAgentAvatarp); effectp->setTargetObject(gObjectList.findObject(to_agent)); effectp->setDuration(LL_HUD_DUR_SHORT); effectp->setColor(LLColor4U(gAgent.getEffectColor())); @@ -1754,35 +1750,31 @@ void LLToolDragAndDrop::commitGiveInventoryCategory(const LLUUID& to_agent, // static BOOL LLToolDragAndDrop::isInventoryGiveAcceptable(LLInventoryItem* item) { - if(!item) + if (!item) { return FALSE; } - if(!item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID())) + if (!item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID())) { return FALSE; } BOOL copyable = FALSE; - if(item->getPermissions().allowCopyBy(gAgent.getID())) copyable = TRUE; + if (item->getPermissions().allowCopyBy(gAgent.getID())) copyable = TRUE; - LLVOAvatarSelf* my_avatar = gAgent.getAvatarObject(); - if(!my_avatar) - { - return FALSE; - } + if (!isAgentAvatarValid()) return FALSE; BOOL acceptable = TRUE; switch(item->getType()) { case LLAssetType::AT_OBJECT: - if(my_avatar->isWearingAttachment(item->getUUID())) + if (gAgentAvatarp->isWearingAttachment(item->getUUID())) { acceptable = FALSE; } break; case LLAssetType::AT_BODYPART: case LLAssetType::AT_CLOTHING: - if(!copyable && gAgentWearables.isWearingItem(item->getUUID())) + if (!copyable && gAgentWearables.isWearingItem(item->getUUID())) { acceptable = FALSE; } @@ -1796,33 +1788,29 @@ BOOL LLToolDragAndDrop::isInventoryGiveAcceptable(LLInventoryItem* item) // Static BOOL LLToolDragAndDrop::isInventoryGroupGiveAcceptable(LLInventoryItem* item) { - if(!item) + if (!item) { return FALSE; } // These permissions are double checked in the simulator in // LLGroupNoticeInventoryItemFetch::result(). - if(!item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID())) + if (!item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID())) { return FALSE; } - if(!item->getPermissions().allowCopyBy(gAgent.getID())) + if (!item->getPermissions().allowCopyBy(gAgent.getID())) { return FALSE; } - LLVOAvatarSelf* my_avatar = gAgent.getAvatarObject(); - if(!my_avatar) - { - return FALSE; - } + if (!isAgentAvatarValid()) return FALSE; BOOL acceptable = TRUE; switch(item->getType()) { case LLAssetType::AT_OBJECT: - if(my_avatar->isWearingAttachment(item->getUUID())) + if (gAgentAvatarp->isWearingAttachment(item->getUUID())) { acceptable = FALSE; } @@ -1848,7 +1836,7 @@ EAcceptance LLToolDragAndDrop::willObjectAcceptInventory(LLViewerObject* obj, LL // help make sure that drops that are from an object to an object // don't have to worry about order of evaluation. Think of this // like check for self in assignment. - if(obj->getID() == item->getParentUUID()) + if (obj->getID() == item->getParentUUID()) { return ACCEPT_NO; } @@ -1857,19 +1845,17 @@ EAcceptance LLToolDragAndDrop::willObjectAcceptInventory(LLViewerObject* obj, LL // gAgent.getGroupID()) // && (obj->mPermModify || obj->mFlagAllowInventoryAdd)); BOOL worn = FALSE; - LLVOAvatarSelf* my_avatar = NULL; switch(item->getType()) { case LLAssetType::AT_OBJECT: - my_avatar = gAgent.getAvatarObject(); - if(my_avatar && my_avatar->isWearingAttachment(item->getUUID())) + if (isAgentAvatarValid() && gAgentAvatarp->isWearingAttachment(item->getUUID())) { worn = TRUE; } break; case LLAssetType::AT_BODYPART: case LLAssetType::AT_CLOTHING: - if(gAgentWearables.isWearingItem(item->getUUID())) + if (gAgentWearables.isWearingItem(item->getUUID())) { worn = TRUE; } @@ -1880,7 +1866,7 @@ EAcceptance LLToolDragAndDrop::willObjectAcceptInventory(LLViewerObject* obj, LL const LLPermissions& perm = item->getPermissions(); BOOL modify = (obj->permModify() || obj->flagAllowInventoryAdd()); BOOL transfer = FALSE; - if((obj->permYouOwner() && (perm.getOwner() == gAgent.getID())) + if ((obj->permYouOwner() && (perm.getOwner() == gAgent.getID())) || perm.allowOperationBy(PERM_TRANSFER, gAgent.getID())) { transfer = TRUE; @@ -1888,15 +1874,15 @@ EAcceptance LLToolDragAndDrop::willObjectAcceptInventory(LLViewerObject* obj, LL BOOL volume = (LL_PCODE_VOLUME == obj->getPCode()); BOOL attached = obj->isAttachment(); BOOL unrestricted = ((perm.getMaskBase() & PERM_ITEM_UNRESTRICTED) == PERM_ITEM_UNRESTRICTED) ? TRUE : FALSE; - if(attached && !unrestricted) + if (attached && !unrestricted) { return ACCEPT_NO_LOCKED; } - else if(modify && transfer && volume && !worn) + else if (modify && transfer && volume && !worn) { return ACCEPT_YES_MULTI; } - else if(!modify) + else if (!modify) { return ACCEPT_NO_LOCKED; } @@ -1927,12 +1913,12 @@ bool LLToolDragAndDrop::handleGiveDragAndDrop(LLUUID dest_agent, LLUUID session_ case DAD_CALLINGCARD: { LLViewerInventoryItem* inv_item = (LLViewerInventoryItem*)cargo_data; - if(gInventory.getItem(inv_item->getUUID()) + if (gInventory.getItem(inv_item->getUUID()) && LLToolDragAndDrop::isInventoryGiveAcceptable(inv_item)) { // *TODO: get multiple object transfers working *accept = ACCEPT_YES_COPY_SINGLE; - if(drop) + if (drop) { LLToolDragAndDrop::giveInventory(dest_agent, inv_item, session_id); } @@ -1950,11 +1936,11 @@ bool LLToolDragAndDrop::handleGiveDragAndDrop(LLUUID dest_agent, LLUUID session_ case DAD_CATEGORY: { LLViewerInventoryCategory* inv_cat = (LLViewerInventoryCategory*)cargo_data; - if( gInventory.getCategory( inv_cat->getUUID() ) ) + if (gInventory.getCategory(inv_cat->getUUID())) { // *TODO: get multiple object transfers working *accept = ACCEPT_YES_COPY_SINGLE; - if(drop) + if (drop) { LLToolDragAndDrop::giveInventoryCategory(dest_agent, inv_cat, session_id); } @@ -1995,7 +1981,7 @@ EAcceptance LLToolDragAndDrop::dad3dRezAttachmentFromInv( { lldebugs << "LLToolDragAndDrop::dad3dRezAttachmentFromInv()" << llendl; // must be in the user's inventory - if(mSource != SOURCE_AGENT && mSource != SOURCE_LIBRARY) + if (mSource != SOURCE_AGENT && mSource != SOURCE_LIBRARY) { return ACCEPT_NO; } @@ -2003,25 +1989,24 @@ EAcceptance LLToolDragAndDrop::dad3dRezAttachmentFromInv( LLViewerInventoryItem* item; LLViewerInventoryCategory* cat; locateInventory(item, cat); - if(!item || !item->isComplete()) return ACCEPT_NO; + if (!item || !item->isComplete()) return ACCEPT_NO; // must not be in the trash const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH); - if( gInventory.isObjectDescendentOf( item->getUUID(), trash_id ) ) + if (gInventory.isObjectDescendentOf(item->getUUID(), trash_id)) { return ACCEPT_NO; } // must not be already wearing it - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if(!avatarp || avatarp->isWearingAttachment(item->getUUID()) ) + if (!isAgentAvatarValid() || gAgentAvatarp->isWearingAttachment(item->getUUID())) { return ACCEPT_NO; } - if( drop ) + if (drop) { - if(mSource == SOURCE_LIBRARY) + if (mSource == SOURCE_LIBRARY) { LLPointer<LLInventoryCallback> cb = new RezAttachmentCallback(0); copy_inventory_item( @@ -2053,10 +2038,9 @@ EAcceptance LLToolDragAndDrop::dad3dRezObjectOnLand( LLViewerInventoryItem* item; LLViewerInventoryCategory* cat; locateInventory(item, cat); - if(!item || !item->isComplete()) return ACCEPT_NO; + if (!item || !item->isComplete()) return ACCEPT_NO; - LLVOAvatarSelf* my_avatar = gAgent.getAvatarObject(); - if( !my_avatar || my_avatar->isWearingAttachment( item->getUUID() ) ) + if (!isAgentAvatarValid() || gAgentAvatarp->isWearingAttachment(item->getUUID())) { return ACCEPT_NO; } @@ -2081,7 +2065,7 @@ EAcceptance LLToolDragAndDrop::dad3dRezObjectOnLand( // check if the item can be copied. If not, send that to the sim // which will remove the inventory item. - if(!item->getPermissions().allowCopyBy(gAgent.getID())) + if (!item->getPermissions().allowCopyBy(gAgent.getID())) { accept = ACCEPT_YES_SINGLE; remove_inventory = TRUE; @@ -2089,13 +2073,13 @@ EAcceptance LLToolDragAndDrop::dad3dRezObjectOnLand( // Check if it's in the trash. const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH); - if(gInventory.isObjectDescendentOf(item->getUUID(), trash_id)) + if (gInventory.isObjectDescendentOf(item->getUUID(), trash_id)) { accept = ACCEPT_YES_SINGLE; remove_inventory = TRUE; } - if(drop) + if (drop) { dropObject(obj, TRUE, FALSE, remove_inventory); } @@ -2116,24 +2100,23 @@ EAcceptance LLToolDragAndDrop::dad3dRezObjectOnObject( LLViewerInventoryItem* item; LLViewerInventoryCategory* cat; locateInventory(item, cat); - if(!item || !item->isComplete()) return ACCEPT_NO; - LLVOAvatarSelf* my_avatar = gAgent.getAvatarObject(); - if( !my_avatar || my_avatar->isWearingAttachment( item->getUUID() ) ) + if (!item || !item->isComplete()) return ACCEPT_NO; + if (!isAgentAvatarValid() || gAgentAvatarp->isWearingAttachment(item->getUUID())) { return ACCEPT_NO; } - if((mask & MASK_CONTROL)) + if ((mask & MASK_CONTROL)) { // *HACK: In order to resolve SL-22177, we need to block drags // from notecards and objects onto other objects. - if(mSource == SOURCE_NOTECARD) + if (mSource == SOURCE_NOTECARD) { return ACCEPT_NO; } EAcceptance rv = willObjectAcceptInventory(obj, item); - if(drop && (ACCEPT_YES_SINGLE <= rv)) + if (drop && (ACCEPT_YES_SINGLE <= rv)) { dropInventory(obj, item, mSource, mSourceID); } @@ -2159,7 +2142,7 @@ EAcceptance LLToolDragAndDrop::dad3dRezObjectOnObject( // check if the item can be copied. If not, send that to the sim // which will remove the inventory item. - if(!item->getPermissions().allowCopyBy(gAgent.getID())) + if (!item->getPermissions().allowCopyBy(gAgent.getID())) { accept = ACCEPT_YES_SINGLE; remove_inventory = TRUE; @@ -2167,13 +2150,13 @@ EAcceptance LLToolDragAndDrop::dad3dRezObjectOnObject( // Check if it's in the trash. const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH); - if(gInventory.isObjectDescendentOf(item->getUUID(), trash_id)) + if (gInventory.isObjectDescendentOf(item->getUUID(), trash_id)) { accept = ACCEPT_YES_SINGLE; remove_inventory = TRUE; } - if(drop) + if (drop) { dropObject(obj, FALSE, FALSE, remove_inventory); } @@ -2188,7 +2171,7 @@ EAcceptance LLToolDragAndDrop::dad3dRezScript( // *HACK: In order to resolve SL-22177, we need to block drags // from notecards and objects onto other objects. - if((SOURCE_WORLD == mSource) || (SOURCE_NOTECARD == mSource)) + if ((SOURCE_WORLD == mSource) || (SOURCE_NOTECARD == mSource)) { return ACCEPT_NO; } @@ -2196,9 +2179,9 @@ EAcceptance LLToolDragAndDrop::dad3dRezScript( LLViewerInventoryItem* item; LLViewerInventoryCategory* cat; locateInventory(item, cat); - if(!item || !item->isComplete()) return ACCEPT_NO; + if (!item || !item->isComplete()) return ACCEPT_NO; EAcceptance rv = willObjectAcceptInventory(obj, item); - if(drop && (ACCEPT_YES_SINGLE <= rv)) + if (drop && (ACCEPT_YES_SINGLE <= rv)) { // rez in the script active by default, rez in inactive if the // control key is being held down. @@ -2226,7 +2209,7 @@ EAcceptance LLToolDragAndDrop::dad3dTextureObject( // *HACK: In order to resolve SL-22177, we need to block drags // from notecards and objects onto other objects. - if((SOURCE_WORLD == mSource) || (SOURCE_NOTECARD == mSource)) + if ((SOURCE_WORLD == mSource) || (SOURCE_NOTECARD == mSource)) { return ACCEPT_NO; } @@ -2234,29 +2217,29 @@ EAcceptance LLToolDragAndDrop::dad3dTextureObject( LLViewerInventoryItem* item; LLViewerInventoryCategory* cat; locateInventory(item, cat); - if(!item || !item->isComplete()) return ACCEPT_NO; + if (!item || !item->isComplete()) return ACCEPT_NO; EAcceptance rv = willObjectAcceptInventory(obj, item); - if((mask & MASK_CONTROL)) + if ((mask & MASK_CONTROL)) { - if((ACCEPT_YES_SINGLE <= rv) && drop) + if ((ACCEPT_YES_SINGLE <= rv) && drop) { dropInventory(obj, item, mSource, mSourceID); } return rv; } - if(!obj->permModify()) + if (!obj->permModify()) { return ACCEPT_NO_LOCKED; } //If texture !copyable don't texture or you'll never get it back. - if(!item->getPermissions().allowCopyBy(gAgent.getID())) + if (!item->getPermissions().allowCopyBy(gAgent.getID())) { return ACCEPT_NO; } - if(drop && (ACCEPT_YES_SINGLE <= rv)) + if (drop && (ACCEPT_YES_SINGLE <= rv)) { - if((mask & MASK_SHIFT)) + if ((mask & MASK_SHIFT)) { dropTextureAllFaces(obj, item, mSource, mSourceID); } @@ -2267,7 +2250,7 @@ EAcceptance LLToolDragAndDrop::dad3dTextureObject( // VEFFECT: SetTexture LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE); - effectp->setSourceObject(gAgent.getAvatarObject()); + effectp->setSourceObject(gAgentAvatarp); effectp->setTargetObject(obj); effectp->setDuration(LL_HUD_DUR_SHORT); effectp->setColor(LLColor4U(gAgent.getEffectColor())); @@ -2281,9 +2264,9 @@ EAcceptance LLToolDragAndDrop::dad3dTextureSelf( LLViewerObject* obj, S32 face, MASK mask, BOOL drop) { lldebugs << "LLToolDragAndDrop::dad3dTextureAvatar()" << llendl; - if(drop) + if (drop) { - if( !(mask & MASK_SHIFT) ) + if (!(mask & MASK_SHIFT)) { dropTextureOneFaceAvatar( (LLVOAvatar*)obj, face, (LLInventoryItem*)mCargoData); } @@ -2299,18 +2282,18 @@ EAcceptance LLToolDragAndDrop::dad3dWearItem( LLViewerInventoryItem* item; LLViewerInventoryCategory* cat; locateInventory(item, cat); - if(!item || !item->isComplete()) return ACCEPT_NO; + if (!item || !item->isComplete()) return ACCEPT_NO; - if(mSource == SOURCE_AGENT || mSource == SOURCE_LIBRARY) + if (mSource == SOURCE_AGENT || mSource == SOURCE_LIBRARY) { // it's in the agent inventory const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH); - if( gInventory.isObjectDescendentOf( item->getUUID(), trash_id ) ) + if (gInventory.isObjectDescendentOf(item->getUUID(), trash_id)) { return ACCEPT_NO; } - if( drop ) + if (drop) { // Don't wear anything until initial wearables are loaded, can // destroy clothing items. @@ -2320,7 +2303,7 @@ EAcceptance LLToolDragAndDrop::dad3dWearItem( return ACCEPT_NO; } - if(mSource == SOURCE_LIBRARY) + if (mSource == SOURCE_LIBRARY) { // create item based on that one, and put it on if that // was a success. @@ -2354,21 +2337,21 @@ EAcceptance LLToolDragAndDrop::dad3dActivateGesture( LLViewerInventoryItem* item; LLViewerInventoryCategory* cat; locateInventory(item, cat); - if(!item || !item->isComplete()) return ACCEPT_NO; + if (!item || !item->isComplete()) return ACCEPT_NO; - if(mSource == SOURCE_AGENT || mSource == SOURCE_LIBRARY) + if (mSource == SOURCE_AGENT || mSource == SOURCE_LIBRARY) { // it's in the agent inventory const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH); - if( gInventory.isObjectDescendentOf( item->getUUID(), trash_id ) ) + if (gInventory.isObjectDescendentOf(item->getUUID(), trash_id)) { return ACCEPT_NO; } - if( drop ) + if (drop) { LLUUID item_id; - if(mSource == SOURCE_LIBRARY) + if (mSource == SOURCE_LIBRARY) { // create item based on that one, and put it on if that // was a success. @@ -2383,7 +2366,7 @@ EAcceptance LLToolDragAndDrop::dad3dActivateGesture( } else { - LLGestureManager::instance().activateGesture(item->getUUID()); + LLGestureMgr::instance().activateGesture(item->getUUID()); gInventory.updateItem(item); gInventory.notifyObservers(); } @@ -2403,7 +2386,7 @@ EAcceptance LLToolDragAndDrop::dad3dWearCategory( LLViewerInventoryItem* item; LLViewerInventoryCategory* category; locateInventory(item, category); - if(!category) return ACCEPT_NO; + if (!category) return ACCEPT_NO; if (drop) { @@ -2416,26 +2399,26 @@ EAcceptance LLToolDragAndDrop::dad3dWearCategory( } } - if(mSource == SOURCE_AGENT) + if (mSource == SOURCE_AGENT) { const LLUUID trash_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_TRASH); - if( gInventory.isObjectDescendentOf( category->getUUID(), trash_id ) ) + if (gInventory.isObjectDescendentOf(category->getUUID(), trash_id)) { return ACCEPT_NO; } - if(drop) + if (drop) { BOOL append = ( (mask & MASK_SHIFT) ? TRUE : FALSE ); - LLAppearanceManager::instance().wearInventoryCategory(category, false, append); + LLAppearanceMgr::instance().wearInventoryCategory(category, false, append); } return ACCEPT_YES_MULTI; } - else if(mSource == SOURCE_LIBRARY) + else if (mSource == SOURCE_LIBRARY) { - if(drop) + if (drop) { - LLAppearanceManager::instance().wearInventoryCategory(category, true, false); + LLAppearanceMgr::instance().wearInventoryCategory(category, true, false); } return ACCEPT_YES_MULTI; } @@ -2454,7 +2437,7 @@ EAcceptance LLToolDragAndDrop::dad3dUpdateInventory( // *HACK: In order to resolve SL-22177, we need to block drags // from notecards and objects onto other objects. - if((SOURCE_WORLD == mSource) || (SOURCE_NOTECARD == mSource)) + if ((SOURCE_WORLD == mSource) || (SOURCE_NOTECARD == mSource)) { return ACCEPT_NO; } @@ -2462,7 +2445,7 @@ EAcceptance LLToolDragAndDrop::dad3dUpdateInventory( LLViewerInventoryItem* item; LLViewerInventoryCategory* cat; locateInventory(item, cat); - if(!item || !item->isComplete()) return ACCEPT_NO; + if (!item || !item->isComplete()) return ACCEPT_NO; LLViewerObject* root_object = obj; if (obj && obj->getParent()) { @@ -2474,7 +2457,7 @@ EAcceptance LLToolDragAndDrop::dad3dUpdateInventory( } EAcceptance rv = willObjectAcceptInventory(root_object, item); - if(root_object && drop && (ACCEPT_YES_COPY_SINGLE <= rv)) + if (root_object && drop && (ACCEPT_YES_COPY_SINGLE <= rv)) { dropInventory(root_object, item, mSource, mSourceID); } @@ -2518,7 +2501,7 @@ EAcceptance LLToolDragAndDrop::dad3dUpdateInventoryCategory( LLDroppableItem droppable(!obj->permYouOwner()); LLInventoryModel::cat_array_t cats; LLInventoryModel::item_array_t items; - gInventory.collectDescendentsIf(cat->getUUID(), + gInventory.collectDescendentsIf (cat->getUUID(), cats, items, LLInventoryModel::EXCLUDE_TRASH, @@ -2547,7 +2530,7 @@ EAcceptance LLToolDragAndDrop::dad3dUpdateInventoryCategory( { const LLViewerInventoryCategory *cat = (*cat_iter); rv = gInventory.isCategoryComplete(cat->getUUID()) ? ACCEPT_YES_MULTI : ACCEPT_NO; - if(rv < ACCEPT_YES_SINGLE) + if (rv < ACCEPT_YES_SINGLE) { lldebugs << "Category " << cat->getUUID() << "is not complete." << llendl; break; @@ -2590,7 +2573,7 @@ EAcceptance LLToolDragAndDrop::dad3dUpdateInventoryCategory( } LLCategoryDropObserver* dropper = new LLCategoryDropObserver(obj->getID(), mSource); dropper->fetchItems(ids); - if(dropper->isEverythingComplete()) + if (dropper->isEverythingComplete()) { dropper->done(); } @@ -2615,27 +2598,26 @@ EAcceptance LLToolDragAndDrop::dad3dGiveInventoryObject( lldebugs << "LLToolDragAndDrop::dad3dGiveInventoryObject()" << llendl; // item has to be in agent inventory. - if(mSource != SOURCE_AGENT) return ACCEPT_NO; + if (mSource != SOURCE_AGENT) return ACCEPT_NO; // find the item now. LLViewerInventoryItem* item; LLViewerInventoryCategory* cat; locateInventory(item, cat); - if(!item || !item->isComplete()) return ACCEPT_NO; - if(!item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID())) + if (!item || !item->isComplete()) return ACCEPT_NO; + if (!item->getPermissions().allowOperationBy(PERM_TRANSFER, gAgent.getID())) { // cannot give away no-transfer objects return ACCEPT_NO; } - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if(avatarp && avatarp->isWearingAttachment( item->getUUID() ) ) + if (isAgentAvatarValid() && gAgentAvatarp->isWearingAttachment(item->getUUID())) { // You can't give objects that are attached to you return ACCEPT_NO; } - if(obj && avatarp) + if (obj && isAgentAvatarValid()) { - if(drop) + if (drop) { giveInventory(obj->getID(), item ); } @@ -2652,16 +2634,16 @@ EAcceptance LLToolDragAndDrop::dad3dGiveInventory( { lldebugs << "LLToolDragAndDrop::dad3dGiveInventory()" << llendl; // item has to be in agent inventory. - if(mSource != SOURCE_AGENT) return ACCEPT_NO; + if (mSource != SOURCE_AGENT) return ACCEPT_NO; LLViewerInventoryItem* item; LLViewerInventoryCategory* cat; locateInventory(item, cat); - if(!item || !item->isComplete()) return ACCEPT_NO; - if(!isInventoryGiveAcceptable(item)) + if (!item || !item->isComplete()) return ACCEPT_NO; + if (!isInventoryGiveAcceptable(item)) { return ACCEPT_NO; } - if(drop && obj) + if (drop && obj) { giveInventory(obj->getID(), item); } @@ -2674,12 +2656,12 @@ EAcceptance LLToolDragAndDrop::dad3dGiveInventoryCategory( LLViewerObject* obj, S32 face, MASK mask, BOOL drop) { lldebugs << "LLToolDragAndDrop::dad3dGiveInventoryCategory()" << llendl; - if(drop && obj) + if (drop && obj) { LLViewerInventoryItem* item; LLViewerInventoryCategory* cat; locateInventory(item, cat); - if(!cat) return ACCEPT_NO; + if (!cat) return ACCEPT_NO; giveInventoryCategory(obj->getID(), cat); } // *TODO: deal with all the issues surrounding multi-object @@ -2695,14 +2677,14 @@ EAcceptance LLToolDragAndDrop::dad3dRezFromObjectOnLand( LLViewerInventoryItem* item = NULL; LLViewerInventoryCategory* cat = NULL; locateInventory(item, cat); - if(!item || !item->isComplete()) return ACCEPT_NO; + if (!item || !item->isComplete()) return ACCEPT_NO; - if(!gAgent.allowOperation(PERM_COPY, item->getPermissions()) + if (!gAgent.allowOperation(PERM_COPY, item->getPermissions()) || !item->getPermissions().allowTransferTo(LLUUID::null)) { return ACCEPT_NO_LOCKED; } - if(drop) + if (drop) { dropObject(obj, TRUE, TRUE, FALSE); } @@ -2716,8 +2698,8 @@ EAcceptance LLToolDragAndDrop::dad3dRezFromObjectOnObject( LLViewerInventoryItem* item; LLViewerInventoryCategory* cat; locateInventory(item, cat); - if(!item || !item->isComplete()) return ACCEPT_NO; - if((mask & MASK_CONTROL)) + if (!item || !item->isComplete()) return ACCEPT_NO; + if ((mask & MASK_CONTROL)) { // *HACK: In order to resolve SL-22177, we need to block drags // from notecards and objects onto other objects. @@ -2725,19 +2707,19 @@ EAcceptance LLToolDragAndDrop::dad3dRezFromObjectOnObject( // *HACK: uncomment this when appropriate //EAcceptance rv = willObjectAcceptInventory(obj, item); - //if(drop && (ACCEPT_YES_SINGLE <= rv)) + //if (drop && (ACCEPT_YES_SINGLE <= rv)) //{ // dropInventory(obj, item, mSource, mSourceID); //} //return rv; } - if(!item->getPermissions().allowCopyBy(gAgent.getID(), + if (!item->getPermissions().allowCopyBy(gAgent.getID(), gAgent.getGroupID()) || !item->getPermissions().allowTransferTo(LLUUID::null)) { return ACCEPT_NO_LOCKED; } - if(drop) + if (drop) { dropObject(obj, FALSE, TRUE, FALSE); } @@ -2753,23 +2735,23 @@ EAcceptance LLToolDragAndDrop::dad3dCategoryOnLand( LLInventoryItem* item; LLInventoryCategory* cat; locateInventory(item, cat); - if(!cat) return ACCEPT_NO; + if (!cat) return ACCEPT_NO; EAcceptance rv = ACCEPT_NO; // find all the items in the category LLViewerInventoryCategory::cat_array_t cats; LLViewerInventoryItem::item_array_t items; LLDropCopyableItems droppable; - gInventory.collectDescendentsIf(cat->getUUID(), + gInventory.collectDescendentsIf (cat->getUUID(), cats, items, LLInventoryModel::EXCLUDE_TRASH, droppable); - if(items.count() > 0) + if (items.count() > 0) { rv = ACCEPT_YES_SINGLE; } - if((rv >= ACCEPT_YES_COPY_SINGLE) && drop) + if ((rv >= ACCEPT_YES_COPY_SINGLE) && drop) { createContainer(items, cat->getName()); return ACCEPT_NO; @@ -2792,19 +2774,19 @@ EAcceptance LLToolDragAndDrop::dad3dAssetOnLand( LLViewerInventoryItem::item_array_t items; LLViewerInventoryItem::item_array_t copyable_items; locateMultipleInventory(items, cats); - if(!items.count()) return ACCEPT_NO; + if (!items.count()) return ACCEPT_NO; EAcceptance rv = ACCEPT_NO; for (S32 i = 0; i < items.count(); i++) { LLInventoryItem* item = items[i]; - if(item->getPermissions().allowCopyBy(gAgent.getID())) + if (item->getPermissions().allowCopyBy(gAgent.getID())) { copyable_items.put(item); rv = ACCEPT_YES_SINGLE; } } - if((rv >= ACCEPT_YES_COPY_SINGLE) && drop) + if ((rv >= ACCEPT_YES_COPY_SINGLE) && drop) { createContainer(copyable_items, NULL); } @@ -2819,20 +2801,20 @@ LLInventoryObject* LLToolDragAndDrop::locateInventory( { item = NULL; cat = NULL; - if(mCargoIDs.empty()) return NULL; - if((mSource == SOURCE_AGENT) || (mSource == SOURCE_LIBRARY)) + if (mCargoIDs.empty()) return NULL; + if ((mSource == SOURCE_AGENT) || (mSource == SOURCE_LIBRARY)) { // The object should be in user inventory. item = (LLViewerInventoryItem*)gInventory.getItem(mCargoIDs[mCurItemIndex]); cat = (LLViewerInventoryCategory*)gInventory.getCategory(mCargoIDs[mCurItemIndex]); } - else if(mSource == SOURCE_WORLD) + else if (mSource == SOURCE_WORLD) { // This object is in some task inventory somewhere. LLViewerObject* obj = gObjectList.findObject(mSourceID); - if(obj) + if (obj) { - if((mCargoTypes[mCurItemIndex] == DAD_CATEGORY) + if ((mCargoTypes[mCurItemIndex] == DAD_CATEGORY) || (mCargoTypes[mCurItemIndex] == DAD_ROOT_CATEGORY)) { cat = (LLViewerInventoryCategory*)obj->getInventoryObject(mCargoIDs[mCurItemIndex]); @@ -2843,16 +2825,16 @@ LLInventoryObject* LLToolDragAndDrop::locateInventory( } } } - else if(mSource == SOURCE_NOTECARD) + else if (mSource == SOURCE_NOTECARD) { LLPreviewNotecard* preview = LLFloaterReg::findTypedInstance<LLPreviewNotecard>("preview_notecard", mSourceID); - if(preview) + if (preview) { item = (LLViewerInventoryItem*)preview->getDragItem(); } } - if(item) return item; - if(cat) return cat; + if (item) return item; + if (cat) return cat; return NULL; } @@ -2860,8 +2842,8 @@ LLInventoryObject* LLToolDragAndDrop::locateInventory( LLInventoryObject* LLToolDragAndDrop::locateMultipleInventory(LLViewerInventoryCategory::cat_array_t& cats, LLViewerInventoryItem::item_array_t& items) { - if(mCargoIDs.count() == 0) return NULL; - if((mSource == SOURCE_AGENT) || (mSource == SOURCE_LIBRARY)) + if (mCargoIDs.count() == 0) return NULL; + if ((mSource == SOURCE_AGENT) || (mSource == SOURCE_LIBRARY)) { // The object should be in user inventory. for (S32 i = 0; i < mCargoIDs.count(); i++) @@ -2878,13 +2860,13 @@ LLInventoryObject* LLToolDragAndDrop::locateMultipleInventory(LLViewerInventoryC } } } - else if(mSource == SOURCE_WORLD) + else if (mSource == SOURCE_WORLD) { // This object is in some task inventory somewhere. LLViewerObject* obj = gObjectList.findObject(mSourceID); - if(obj) + if (obj) { - if((mCargoType == DAD_CATEGORY) + if ((mCargoType == DAD_CATEGORY) || (mCargoType == DAD_ROOT_CATEGORY)) { // The object should be in user inventory. @@ -2910,17 +2892,17 @@ LLInventoryObject* LLToolDragAndDrop::locateMultipleInventory(LLViewerInventoryC } } } - else if(mSource == SOURCE_NOTECARD) + else if (mSource == SOURCE_NOTECARD) { LLPreviewNotecard* card; card = (LLPreviewNotecard*)LLPreview::find(mSourceID); - if(card) + if (card) { items.put((LLInventoryItem*)card->getDragItem()); } } - if(items.count()) return items[0]; - if(cats.count()) return cats[0]; + if (items.count()) return items[0]; + if (cats.count()) return cats[0]; return NULL; } */ diff --git a/indra/newview/lltooldraganddrop.h b/indra/newview/lltooldraganddrop.h index 0da13dac8b..85d003e5fc 100644 --- a/indra/newview/lltooldraganddrop.h +++ b/indra/newview/lltooldraganddrop.h @@ -81,7 +81,7 @@ public: const LLUUID& source_id = LLUUID::null, const LLUUID& object_id = LLUUID::null); void beginMultiDrag(const std::vector<EDragAndDropType> types, - const std::vector<LLUUID>& cargo_ids, + const uuid_vec_t& cargo_ids, ESource source, const LLUUID& source_id = LLUUID::null); void endDrag(); @@ -125,7 +125,7 @@ protected: std::vector<EDragAndDropType> mCargoTypes; //void* mCargoData; - std::vector<LLUUID> mCargoIDs; + uuid_vec_t mCargoIDs; ESource mSource; LLUUID mSourceID; LLUUID mObjectID; diff --git a/indra/newview/lltoolfocus.cpp b/indra/newview/lltoolfocus.cpp index 1e2e7095d8..032714cabf 100644 --- a/indra/newview/lltoolfocus.cpp +++ b/indra/newview/lltoolfocus.cpp @@ -173,14 +173,12 @@ void LLToolCamera::pickCallback(const LLPickInfo& pick_info) BOOL good_customize_avatar_hit = FALSE; if( hit_obj ) { - LLVOAvatar* avatar = gAgent.getAvatarObject(); - if( hit_obj == avatar) + if (isAgentAvatarValid() && (hit_obj == gAgentAvatarp)) { // It's you good_customize_avatar_hit = TRUE; } - else - if( hit_obj->isAttachment() && hit_obj->permYouOwner() ) + else if (hit_obj->isAttachment() && hit_obj->permYouOwner()) { // It's an attachment that you're wearing good_customize_avatar_hit = TRUE; @@ -223,8 +221,8 @@ void LLToolCamera::pickCallback(const LLPickInfo& pick_info) gAgentCamera.cameraThirdPerson() && gViewerWindow->getLeftMouseDown() && !gSavedSettings.getBOOL("FreezeTime") && - (hit_obj == gAgent.getAvatarObject() || - (hit_obj && hit_obj->isAttachment() && LLVOAvatar::findAvatarFromAttachment(hit_obj)->isSelf()))) + (hit_obj == gAgentAvatarp || + (hit_obj && hit_obj->isAttachment() && LLVOAvatar::findAvatarFromAttachment(hit_obj)->isSelf()))) { LLToolCamera::getInstance()->mMouseSteering = TRUE; } diff --git a/indra/newview/lltoolgrab.cpp b/indra/newview/lltoolgrab.cpp index 008cf16f2e..04d873f91b 100644 --- a/indra/newview/lltoolgrab.cpp +++ b/indra/newview/lltoolgrab.cpp @@ -708,7 +708,7 @@ void LLToolGrab::handleHoverActive(S32 x, S32 y, MASK mask) { if (!gAgentCamera.cameraMouselook() && !objectp->isHUDAttachment() && - objectp->getRoot() == gAgent.getAvatarObject()->getRoot()) + objectp->getRoot() == gAgentAvatarp->getRoot()) { // force focus to point in space where we were looking previously gAgentCamera.setFocusGlobal(gAgentCamera.calcFocusPositionTargetGlobal(), LLUUID::null); diff --git a/indra/newview/lltoolmorph.cpp b/indra/newview/lltoolmorph.cpp index c42c47c486..969049ee65 100644 --- a/indra/newview/lltoolmorph.cpp +++ b/indra/newview/lltoolmorph.cpp @@ -139,22 +139,20 @@ void LLVisualParamHint::requestHintUpdates( LLVisualParamHint* exception1, LLVis BOOL LLVisualParamHint::needsRender() { - return mNeedsUpdate && mDelayFrames-- <= 0 && !gAgent.getAvatarObject()->mAppearanceAnimating && mAllowsUpdates; + return mNeedsUpdate && mDelayFrames-- <= 0 && !gAgentAvatarp->mAppearanceAnimating && mAllowsUpdates; } void LLVisualParamHint::preRender(BOOL clear_depth) { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - mLastParamWeight = mVisualParam->getWeight(); mVisualParam->setWeight(mVisualParamWeight, FALSE); - avatarp->setVisualParamWeight(mVisualParam->getID(), mVisualParamWeight, FALSE); - avatarp->setVisualParamWeight("Blink_Left", 0.f); - avatarp->setVisualParamWeight("Blink_Right", 0.f); - avatarp->updateComposites(); - avatarp->updateVisualParams(); - avatarp->updateGeometry(avatarp->mDrawable); - avatarp->updateLOD(); + gAgentAvatarp->setVisualParamWeight(mVisualParam->getID(), mVisualParamWeight, FALSE); + gAgentAvatarp->setVisualParamWeight("Blink_Left", 0.f); + gAgentAvatarp->setVisualParamWeight("Blink_Right", 0.f); + gAgentAvatarp->updateComposites(); + gAgentAvatarp->updateVisualParams(); + gAgentAvatarp->updateGeometry(gAgentAvatarp->mDrawable); + gAgentAvatarp->updateLOD(); LLViewerDynamicTexture::preRender(clear_depth); } @@ -165,7 +163,6 @@ void LLVisualParamHint::preRender(BOOL clear_depth) BOOL LLVisualParamHint::render() { LLVisualParamReset::sDirty = TRUE; - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); gGL.pushUIMatrix(); gGL.loadUIIdentity(); @@ -196,7 +193,7 @@ BOOL LLVisualParamHint::render() const std::string& cam_target_mesh_name = mVisualParam->getCameraTargetName(); if( !cam_target_mesh_name.empty() ) { - cam_target_joint = (LLViewerJointMesh*)avatarp->getJoint( cam_target_mesh_name ); + cam_target_joint = (LLViewerJointMesh*)gAgentAvatarp->getJoint( cam_target_mesh_name ); } if( !cam_target_joint ) { @@ -204,11 +201,11 @@ BOOL LLVisualParamHint::render() } if( !cam_target_joint ) { - cam_target_joint = (LLViewerJointMesh*)avatarp->getJoint("mHead"); + cam_target_joint = (LLViewerJointMesh*)gAgentAvatarp->getJoint("mHead"); } LLQuaternion avatar_rotation; - LLJoint* root_joint = avatarp->getRootJoint(); + LLJoint* root_joint = gAgentAvatarp->getRootJoint(); if( root_joint ) { avatar_rotation = root_joint->getWorldRotation(); @@ -236,17 +233,17 @@ BOOL LLVisualParamHint::render() LLViewerCamera::getInstance()->setPerspective(FALSE, mOrigin.mX, mOrigin.mY, mFullWidth, mFullHeight, FALSE); - if (avatarp->mDrawable.notNull()) + if (gAgentAvatarp->mDrawable.notNull()) { - LLDrawPoolAvatar *avatarPoolp = (LLDrawPoolAvatar *)avatarp->mDrawable->getFace(0)->getPool(); + LLDrawPoolAvatar *avatarPoolp = (LLDrawPoolAvatar *)gAgentAvatarp->mDrawable->getFace(0)->getPool(); LLGLDepthTest gls_depth(GL_TRUE, GL_TRUE); gGL.setAlphaRejectSettings(LLRender::CF_ALWAYS); gGL.setSceneBlendType(LLRender::BT_REPLACE); - avatarPoolp->renderAvatars(avatarp); // renders only one avatar + avatarPoolp->renderAvatars(gAgentAvatarp); // renders only one avatar gGL.setSceneBlendType(LLRender::BT_ALPHA); gGL.setAlphaRejectSettings(LLRender::CF_DEFAULT); } - avatarp->setVisualParamWeight(mVisualParam->getID(), mLastParamWeight); + gAgentAvatarp->setVisualParamWeight(mVisualParam->getID(), mLastParamWeight); mVisualParam->setWeight(mLastParamWeight, FALSE); gGL.color4f(1,1,1,1); mGLTexturep->setGLTextureCreated(true); @@ -297,10 +294,9 @@ BOOL LLVisualParamReset::render() { if (sDirty) { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - avatarp->updateComposites(); - avatarp->updateVisualParams(); - avatarp->updateGeometry(avatarp->mDrawable); + gAgentAvatarp->updateComposites(); + gAgentAvatarp->updateVisualParams(); + gAgentAvatarp->updateGeometry(gAgentAvatarp->mDrawable); sDirty = FALSE; } diff --git a/indra/newview/lltoolpie.cpp b/indra/newview/lltoolpie.cpp index b7947cf4ae..84c463495b 100644 --- a/indra/newview/lltoolpie.cpp +++ b/indra/newview/lltoolpie.cpp @@ -205,15 +205,15 @@ BOOL LLToolPie::pickLeftMouseDownCallback() // touch behavior down below... break; case CLICK_ACTION_SIT: - - if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->isSitting())) // agent not already sitting { - handle_object_sit_or_stand(); - // put focus in world when sitting on an object - gFocusMgr.setKeyboardFocus(NULL); - return TRUE; - } // else nothing (fall through to touch) - + if (isAgentAvatarValid() && !gAgentAvatarp->isSitting()) // agent not already sitting + { + handle_object_sit_or_stand(); + // put focus in world when sitting on an object + gFocusMgr.setKeyboardFocus(NULL); + return TRUE; + } // else nothing (fall through to touch) + } case CLICK_ACTION_PAY: if ((object && object->flagTakesMoney()) || (parent && parent->flagTakesMoney())) @@ -330,7 +330,7 @@ BOOL LLToolPie::pickLeftMouseDownCallback() } object = (LLViewerObject*)object->getParent(); } - if (object && object == gAgent.getAvatarObject()) + if (object && object == gAgentAvatarp) { // we left clicked on avatar, switch to focus mode LLToolMgr::getInstance()->setTransientTool(LLToolCamera::getInstance()); @@ -411,9 +411,11 @@ ECursorType cursor_from_object(LLViewerObject* object) switch(click_action) { case CLICK_ACTION_SIT: - if ((gAgent.getAvatarObject() != NULL) && (!gAgent.getAvatarObject()->isSitting())) // not already sitting? { - cursor = UI_CURSOR_TOOLSIT; + if (isAgentAvatarValid() && !gAgentAvatarp->isSitting()) // not already sitting? + { + cursor = UI_CURSOR_TOOLSIT; + } } break; case CLICK_ACTION_BUY: diff --git a/indra/newview/lltoolplacer.cpp b/indra/newview/lltoolplacer.cpp index b10ee590e0..91f01f0b36 100644 --- a/indra/newview/lltoolplacer.cpp +++ b/indra/newview/lltoolplacer.cpp @@ -62,6 +62,7 @@ #include "llviewerobjectlist.h" #include "llviewercamera.h" #include "llviewerstats.h" +#include "llvoavatarself.h" // linden library headers #include "llprimitive.h" @@ -433,7 +434,7 @@ BOOL LLToolPlacer::addObject( LLPCode pcode, S32 x, S32 y, U8 use_physics ) // VEFFECT: AddObject LLHUDEffectSpiral *effectp = (LLHUDEffectSpiral *)LLHUDManager::getInstance()->createViewerEffect(LLHUDObject::LL_HUD_EFFECT_BEAM, TRUE); - effectp->setSourceObject((LLViewerObject*)gAgent.getAvatarObject()); + effectp->setSourceObject((LLViewerObject*)gAgentAvatarp); effectp->setPositionGlobal(regionp->getPosGlobalFromRegion(ray_end_region)); effectp->setDuration(LL_HUD_DUR_SHORT); effectp->setColor(LLColor4U(gAgent.getEffectColor())); diff --git a/indra/newview/lltoolselect.cpp b/indra/newview/lltoolselect.cpp index 6e0c6663e9..2065ba1791 100644 --- a/indra/newview/lltoolselect.cpp +++ b/indra/newview/lltoolselect.cpp @@ -169,8 +169,8 @@ LLObjectSelectionHandle LLToolSelect::handleObjectSelection(const LLPickInfo& pi } if (!gAgentCamera.getFocusOnAvatar() && // if camera not glued to avatar - LLVOAvatar::findAvatarFromAttachment(object) != gAgent.getAvatarObject() && // and it's not one of your attachments - object != gAgent.getAvatarObject()) // and it's not you + LLVOAvatar::findAvatarFromAttachment(object) != gAgentAvatarp && // and it's not one of your attachments + object != gAgentAvatarp) // and it's not you { // have avatar turn to face the selected object(s) LLVector3d selection_center = LLSelectMgr::getInstance()->getSelectionCenterGlobal(); diff --git a/indra/newview/llviewerdisplay.cpp b/indra/newview/llviewerdisplay.cpp index 5a2b901bd7..823466e33e 100644 --- a/indra/newview/llviewerdisplay.cpp +++ b/indra/newview/llviewerdisplay.cpp @@ -345,9 +345,9 @@ void display(BOOL rebuild, F32 zoom_factor, int subfield, BOOL for_snapshot) const F32 TELEPORT_ARRIVAL_DELAY = 2.f; // Time to preload the world before raising the curtain after we've actually already arrived. S32 attach_count = 0; - if (gAgent.getAvatarObject()) + if (isAgentAvatarValid()) { - attach_count = gAgent.getAvatarObject()->getAttachmentCount(); + attach_count = gAgentAvatarp->getAttachmentCount(); } F32 teleport_save_time = TELEPORT_EXPIRY + TELEPORT_EXPIRY_PER_ATTACHMENT * attach_count; F32 teleport_elapsed = gTeleportDisplayTimer.getElapsedTimeF32(); @@ -1032,11 +1032,10 @@ LLRect get_whole_screen_region() bool get_hud_matrices(const LLRect& screen_region, glh::matrix4f &proj, glh::matrix4f &model) { - LLVOAvatar* my_avatarp = gAgent.getAvatarObject(); - if (my_avatarp && my_avatarp->hasHUDAttachment()) + if (isAgentAvatarValid() && gAgentAvatarp->hasHUDAttachment()) { F32 zoom_level = gAgentCamera.mHUDCurZoom; - LLBBox hud_bbox = my_avatarp->getHUDBBox(); + LLBBox hud_bbox = gAgentAvatarp->getHUDBBox(); F32 hud_depth = llmax(1.f, hud_bbox.getExtentLocal().mV[VX] * 1.1f); proj = gl_ortho(-0.5f * LLViewerCamera::getInstance()->getAspect(), 0.5f * LLViewerCamera::getInstance()->getAspect(), -0.5f, 0.5f, 0.f, hud_depth); @@ -1300,7 +1299,7 @@ void render_ui_2d() gGL.getTexUnit(0)->setTextureBlendType(LLTexUnit::TB_MULT); // render outline for HUD - if (gAgent.getAvatarObject() && gAgentCamera.mHUDCurZoom < 0.98f) + if (isAgentAvatarValid() && gAgentCamera.mHUDCurZoom < 0.98f) { glPushMatrix(); S32 half_width = (gViewerWindow->getWorldViewWidthScaled() / 2); diff --git a/indra/newview/llviewerinventory.cpp b/indra/newview/llviewerinventory.cpp index 7bf7bf5e2f..75ec02f8ea 100644 --- a/indra/newview/llviewerinventory.cpp +++ b/indra/newview/llviewerinventory.cpp @@ -102,7 +102,7 @@ public: const std::string verb = params[1].asString(); if (verb == "select") { - std::vector<LLUUID> items_to_open; + uuid_vec_t items_to_open; items_to_open.push_back(inventory_id); //inventory_handler is just a stub, because we don't know from who this offer open_inventory_offer(items_to_open, "inventory_handler"); @@ -791,7 +791,7 @@ void WearOnAvatarCallback::fire(const LLUUID& inv_item) void ModifiedCOFCallback::fire(const LLUUID& inv_item) { - LLAppearanceManager::instance().updateAppearanceFromCOF(); + LLAppearanceMgr::instance().updateAppearanceFromCOF(); if( CAMERA_MODE_CUSTOMIZE_AVATAR == gAgentCamera.getCameraMode() ) { // If we're in appearance editing mode, the current tab may need to be refreshed @@ -827,7 +827,7 @@ void ActivateGestureCallback::fire(const LLUUID& inv_item) if (inv_item.isNull()) return; - LLGestureManager::instance().activateGesture(inv_item); + LLGestureMgr::instance().activateGesture(inv_item); } void CreateGestureCallback::fire(const LLUUID& inv_item) @@ -835,7 +835,7 @@ void CreateGestureCallback::fire(const LLUUID& inv_item) if (inv_item.isNull()) return; - LLGestureManager::instance().activateGesture(inv_item); + LLGestureMgr::instance().activateGesture(inv_item); LLViewerInventoryItem* item = gInventory.getItem(inv_item); if (!item) return; diff --git a/indra/newview/llviewerkeyboard.cpp b/indra/newview/llviewerkeyboard.cpp index cbec2c890f..dd7390a907 100644 --- a/indra/newview/llviewerkeyboard.cpp +++ b/indra/newview/llviewerkeyboard.cpp @@ -877,7 +877,7 @@ EKeyboardMode LLViewerKeyboard::getMode() { return MODE_EDIT_AVATAR; } - else if (gAgent.getAvatarObject() && gAgent.getAvatarObject()->isSitting()) + else if (isAgentAvatarValid() && gAgentAvatarp->isSitting()) { return MODE_SITTING; } diff --git a/indra/newview/llviewermedia.cpp b/indra/newview/llviewermedia.cpp index ab55fcff6e..6f0d9cdd95 100644 --- a/indra/newview/llviewermedia.cpp +++ b/indra/newview/llviewermedia.cpp @@ -1008,6 +1008,9 @@ void LLViewerMedia::clearAllCookies() } } + // Clear all cookies from the cookie store + getCookieStore()->setAllCookies(""); + // FIXME: this may not be sufficient, since the on-disk cookie file won't get written until some browser instance exits cleanly. // It also won't clear cookies for other accounts, or for any account if we're not logged in, and won't do anything at all if there are no webkit plugins loaded. // Until such time as we can centralize cookie storage, the following hack should cover these cases: @@ -1051,7 +1054,8 @@ void LLViewerMedia::clearAllCookies() { LLFile::remove(target); } - + + // Other accounts may have new-style cookie files too -- delete them as well target = base_dir; target += filename; target += gDirUtilp->getDirDelimiter(); @@ -3195,7 +3199,7 @@ bool LLViewerMediaImpl::isObjectAttachedToAnotherAvatar(LLVOVolume *obj) if (NULL != object) { LLVOAvatar *avatar = object->asAvatar(); - if (NULL != avatar && avatar != gAgent.getAvatarObject()) + if ((NULL != avatar) && (avatar != gAgentAvatarp)) { result = true; break; diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index d79cb85730..fe924d68a5 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -2692,11 +2692,10 @@ class LLSelfEnableRemoveAllAttachments : public view_listener_t bool handleEvent(const LLSD& userdata) { bool new_value = false; - if (gAgent.getAvatarObject()) + if (isAgentAvatarValid()) { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin(); - iter != avatarp->mAttachmentPoints.end(); ) + for (LLVOAvatar::attachment_map_t::iterator iter = gAgentAvatarp->mAttachmentPoints.begin(); + iter != gAgentAvatarp->mAttachmentPoints.end(); ) { LLVOAvatar::attachment_map_t::iterator curiter = iter++; LLViewerJointAttachment* attachment = curiter->second; @@ -2824,9 +2823,9 @@ bool handle_go_to() LLViewerParcelMgr::getInstance()->deselectLand(); - if (gAgent.getAvatarObject() && !gSavedSettings.getBOOL("AutoPilotLocksCamera")) + if (isAgentAvatarValid() && !gSavedSettings.getBOOL("AutoPilotLocksCamera")) { - gAgentCamera.setFocusGlobal(gAgentCamera.getFocusTargetGlobal(), gAgent.getAvatarObject()->getID()); + gAgentCamera.setFocusGlobal(gAgentCamera.getFocusTargetGlobal(), gAgentAvatarp->getID()); } else { @@ -3365,7 +3364,7 @@ class LLSelfStandUp : public view_listener_t bool enable_standup_self() { - bool new_value = gAgent.getAvatarObject() && gAgent.getAvatarObject()->isSitting(); + bool new_value = isAgentAvatarValid() && gAgentAvatarp->isSitting(); return new_value; } @@ -3694,9 +3693,9 @@ class LLLandSit : public view_listener_t LLVector3d posGlobal = LLToolPie::getInstance()->getPick().mPosGlobal; LLQuaternion target_rot; - if (gAgent.getAvatarObject()) + if (isAgentAvatarValid()) { - target_rot = gAgent.getAvatarObject()->getRotation(); + target_rot = gAgentAvatarp->getRotation(); } else { @@ -4587,13 +4586,9 @@ BOOL sitting_on_selection() } // Need to determine if avatar is sitting on this object - LLVOAvatar* avatar = gAgent.getAvatarObject(); - if (!avatar) - { - return FALSE; - } + if (!isAgentAvatarValid()) return FALSE; - return (avatar->isSitting() && avatar->getRoot() == root_object); + return (gAgentAvatarp->isSitting() && gAgentAvatarp->getRoot() == root_object); } class LLToolsSaveToInventory : public view_listener_t @@ -5846,7 +5841,7 @@ private: S32 index = userdata.asInteger(); LLViewerJointAttachment* attachment_point = NULL; if (index > 0) - attachment_point = get_if_there(gAgent.getAvatarObject()->mAttachmentPoints, index, (LLViewerJointAttachment*)NULL); + attachment_point = get_if_there(gAgentAvatarp->mAttachmentPoints, index, (LLViewerJointAttachment*)NULL); confirm_replace_attachment(0, attachment_point); } return true; @@ -5867,8 +5862,8 @@ void near_attach_object(BOOL success, void *user_data) U8 attachment_id = 0; if (attachment) { - for (LLVOAvatar::attachment_map_t::const_iterator iter = gAgent.getAvatarObject()->mAttachmentPoints.begin(); - iter != gAgent.getAvatarObject()->mAttachmentPoints.end(); ++iter) + for (LLVOAvatar::attachment_map_t::const_iterator iter = gAgentAvatarp->mAttachmentPoints.begin(); + iter != gAgentAvatarp->mAttachmentPoints.end(); ++iter) { if (iter->second == attachment) { @@ -5993,7 +5988,7 @@ class LLAttachmentDetachFromPoint : public view_listener_t { bool handleEvent(const LLSD& user_data) { - const LLViewerJointAttachment *attachment = get_if_there(gAgent.getAvatarObject()->mAttachmentPoints, user_data.asInteger(), (LLViewerJointAttachment*)NULL); + const LLViewerJointAttachment *attachment = get_if_there(gAgentAvatarp->mAttachmentPoints, user_data.asInteger(), (LLViewerJointAttachment*)NULL); if (attachment->getNumObjects() > 0) { gMessageSystem->newMessage("ObjectDetach"); @@ -6021,7 +6016,7 @@ static bool onEnableAttachmentLabel(LLUICtrl* ctrl, const LLSD& data) LLMenuItemGL* menu = dynamic_cast<LLMenuItemGL*>(ctrl); if (menu) { - const LLViewerJointAttachment *attachment = get_if_there(gAgent.getAvatarObject()->mAttachmentPoints, data["index"].asInteger(), (LLViewerJointAttachment*)NULL); + const LLViewerJointAttachment *attachment = get_if_there(gAgentAvatarp->mAttachmentPoints, data["index"].asInteger(), (LLViewerJointAttachment*)NULL); if (attachment) { label = data["label"].asString(); @@ -6139,7 +6134,7 @@ class LLAttachmentEnableDrop : public view_listener_t if (object && LLSelectMgr::getInstance()->getSelection()->contains(object,SELECT_ALL_TES )) { S32 attachmentID = ATTACHMENT_ID_FROM_STATE(object->getState()); - attachment = get_if_there(gAgent.getAvatarObject()->mAttachmentPoints, attachmentID, (LLViewerJointAttachment*)NULL); + attachment = get_if_there(gAgentAvatarp->mAttachmentPoints, attachmentID, (LLViewerJointAttachment*)NULL); if (attachment) { @@ -6271,8 +6266,8 @@ class LLAttachmentPointFilled : public view_listener_t bool handleEvent(const LLSD& user_data) { bool enable = false; - LLVOAvatar::attachment_map_t::iterator found_it = gAgent.getAvatarObject()->mAttachmentPoints.find(user_data.asInteger()); - if (found_it != gAgent.getAvatarObject()->mAttachmentPoints.end()) + LLVOAvatar::attachment_map_t::iterator found_it = gAgentAvatarp->mAttachmentPoints.find(user_data.asInteger()); + if (found_it != gAgentAvatarp->mAttachmentPoints.end()) { enable = found_it->second->getNumObjects() > 0; } @@ -6468,13 +6463,13 @@ void handle_selected_texture_info(void*) void handle_test_male(void*) { - LLAppearanceManager::instance().wearOutfitByName("Male Shape & Outfit"); + LLAppearanceMgr::instance().wearOutfitByName("Male Shape & Outfit"); //gGestureList.requestResetFromServer( TRUE ); } void handle_test_female(void*) { - LLAppearanceManager::instance().wearOutfitByName("Female Shape & Outfit"); + LLAppearanceMgr::instance().wearOutfitByName("Female Shape & Outfit"); //gGestureList.requestResetFromServer( FALSE ); } @@ -6489,15 +6484,10 @@ void handle_toggle_pg(void*) void handle_dump_attachments(void*) { - LLVOAvatar* avatar = gAgent.getAvatarObject(); - if( !avatar ) - { - llinfos << "NO AVATAR" << llendl; - return; - } + if(!isAgentAvatarValid()) return; - for (LLVOAvatar::attachment_map_t::iterator iter = avatar->mAttachmentPoints.begin(); - iter != avatar->mAttachmentPoints.end(); ) + for (LLVOAvatar::attachment_map_t::iterator iter = gAgentAvatarp->mAttachmentPoints.begin(); + iter != gAgentAvatarp->mAttachmentPoints.end(); ) { LLVOAvatar::attachment_map_t::iterator curiter = iter++; LLViewerJointAttachment* attachment = curiter->second; @@ -6917,7 +6907,7 @@ void reload_vertex_shader(void *) void handle_dump_avatar_local_textures(void*) { - gAgent.getAvatarObject()->dumpLocalTextures(); + gAgentAvatarp->dumpLocalTextures(); } void handle_dump_timers() @@ -6937,86 +6927,83 @@ void handle_debug_avatar_textures(void*) void handle_grab_texture(void* data) { ETextureIndex tex_index = (ETextureIndex)((intptr_t)data); - const LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (avatarp) - { - // MULTI-WEARABLE: change to support an index - const LLUUID& asset_id = avatarp->grabLocalTexture(tex_index, 0); - LL_INFOS("texture") << "Adding baked texture " << asset_id << " to inventory." << llendl; - LLAssetType::EType asset_type = LLAssetType::AT_TEXTURE; - LLInventoryType::EType inv_type = LLInventoryType::IT_TEXTURE; - const LLUUID folder_id = gInventory.findCategoryUUIDForType(LLFolderType::assetTypeToFolderType(asset_type)); - if(folder_id.notNull()) - { - std::string name = "Unknown"; - const LLVOAvatarDictionary::TextureEntry *texture_dict = LLVOAvatarDictionary::getInstance()->getTexture(tex_index); - if (texture_dict->mIsBakedTexture) - { - EBakedTextureIndex baked_index = texture_dict->mBakedTextureIndex; - name = "Baked " + LLVOAvatarDictionary::getInstance()->getBakedTexture(baked_index)->mNameCapitalized; - } - name += " Texture"; - - LLUUID item_id; - item_id.generate(); - LLPermissions perm; - perm.init(gAgentID, - gAgentID, - LLUUID::null, - LLUUID::null); - U32 next_owner_perm = PERM_MOVE | PERM_TRANSFER; - perm.initMasks(PERM_ALL, - PERM_ALL, - PERM_NONE, - PERM_NONE, - next_owner_perm); - time_t creation_date_now = time_corrected(); - LLPointer<LLViewerInventoryItem> item - = new LLViewerInventoryItem(item_id, - folder_id, - perm, - asset_id, - asset_type, - inv_type, - name, - LLStringUtil::null, - LLSaleInfo::DEFAULT, - LLInventoryItem::II_FLAGS_NONE, - creation_date_now); - - item->updateServer(TRUE); - gInventory.updateItem(item); - gInventory.notifyObservers(); - - // Show the preview panel for textures to let - // user know that the image is now in inventory. - LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(); - if(active_panel) - { - LLFocusableElement* focus_ctrl = gFocusMgr.getKeyboardFocus(); - - active_panel->setSelection(item_id, TAKE_FOCUS_NO); - active_panel->openSelected(); - //LLFloaterInventory::dumpSelectionInformation((void*)view); - // restore keyboard focus - gFocusMgr.setKeyboardFocus(focus_ctrl); - } - } - else - { - llwarns << "Can't find a folder to put it in" << llendl; + if (!isAgentAvatarValid()) return; + + // MULTI-WEARABLE: change to support an index + const LLUUID& asset_id = gAgentAvatarp->grabLocalTexture(tex_index, 0); + LL_INFOS("texture") << "Adding baked texture " << asset_id << " to inventory." << llendl; + LLAssetType::EType asset_type = LLAssetType::AT_TEXTURE; + LLInventoryType::EType inv_type = LLInventoryType::IT_TEXTURE; + const LLUUID folder_id = gInventory.findCategoryUUIDForType(LLFolderType::assetTypeToFolderType(asset_type)); + if(folder_id.notNull()) + { + std::string name = "Unknown"; + const LLVOAvatarDictionary::TextureEntry *texture_dict = LLVOAvatarDictionary::getInstance()->getTexture(tex_index); + if (texture_dict->mIsBakedTexture) + { + EBakedTextureIndex baked_index = texture_dict->mBakedTextureIndex; + name = "Baked " + LLVOAvatarDictionary::getInstance()->getBakedTexture(baked_index)->mNameCapitalized; + } + name += " Texture"; + + LLUUID item_id; + item_id.generate(); + LLPermissions perm; + perm.init(gAgentID, + gAgentID, + LLUUID::null, + LLUUID::null); + U32 next_owner_perm = PERM_MOVE | PERM_TRANSFER; + perm.initMasks(PERM_ALL, + PERM_ALL, + PERM_NONE, + PERM_NONE, + next_owner_perm); + time_t creation_date_now = time_corrected(); + LLPointer<LLViewerInventoryItem> item + = new LLViewerInventoryItem(item_id, + folder_id, + perm, + asset_id, + asset_type, + inv_type, + name, + LLStringUtil::null, + LLSaleInfo::DEFAULT, + LLInventoryItem::II_FLAGS_NONE, + creation_date_now); + + item->updateServer(TRUE); + gInventory.updateItem(item); + gInventory.notifyObservers(); + + // Show the preview panel for textures to let + // user know that the image is now in inventory. + LLInventoryPanel *active_panel = LLInventoryPanel::getActiveInventoryPanel(); + if(active_panel) + { + LLFocusableElement* focus_ctrl = gFocusMgr.getKeyboardFocus(); + + active_panel->setSelection(item_id, TAKE_FOCUS_NO); + active_panel->openSelected(); + //LLFloaterInventory::dumpSelectionInformation((void*)view); + // restore keyboard focus + gFocusMgr.setKeyboardFocus(focus_ctrl); } } + else + { + llwarns << "Can't find a folder to put it in" << llendl; + } } BOOL enable_grab_texture(void* data) { ETextureIndex index = (ETextureIndex)((intptr_t)data); - const LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (avatarp) + if (isAgentAvatarValid()) { // MULTI-WEARABLE: - return avatarp->canGrabLocalTexture(index,0); + return gAgentAvatarp->canGrabLocalTexture(index,0); } return FALSE; } @@ -7227,12 +7214,11 @@ void handle_buy_currency_test(void*) void handle_rebake_textures(void*) { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (!avatarp) return; + if (!isAgentAvatarValid()) return; // Slam pending upload count to "unstick" things bool slam_for_debug = true; - avatarp->forceBakeAllTextures(slam_for_debug); + gAgentAvatarp->forceBakeAllTextures(slam_for_debug); } void toggle_visibility(void* user_data) diff --git a/indra/newview/llviewermessage.cpp b/indra/newview/llviewermessage.cpp index c2a78f20e1..42c8b4ee64 100644 --- a/indra/newview/llviewermessage.cpp +++ b/indra/newview/llviewermessage.cpp @@ -870,9 +870,9 @@ bool check_offer_throttle(const std::string& from_name, bool check_only) } } -void open_inventory_offer(const std::vector<LLUUID>& items, const std::string& from_name) +void open_inventory_offer(const uuid_vec_t& items, const std::string& from_name) { - for (std::vector<LLUUID>::const_iterator item_iter = items.begin(); + for (uuid_vec_t::const_iterator item_iter = items.begin(); item_iter != items.end(); ++item_iter) { @@ -1263,8 +1263,8 @@ bool LLOfferInfo::inventory_offer_callback(const LLSD& notification, const LLSD& // Disabled logging to old chat floater to fix crash in group notices - EXT-4149 // LLFloaterChat::addChatHistory(chat); - LLInventoryFetchComboObserver::folder_ref_t folders; - LLInventoryFetchComboObserver::item_ref_t items; + uuid_vec_t folders; + uuid_vec_t items; items.push_back(mObjectID); LLDiscardAgentOffer* discard_agent_offer; discard_agent_offer = new LLDiscardAgentOffer(mFolderID, mObjectID); @@ -2844,8 +2844,8 @@ public: LLInventoryModel::cat_array_t land_cats; LLInventoryModel::item_array_t land_items; - folder_ref_t::iterator it = mCompleteFolders.begin(); - folder_ref_t::iterator end = mCompleteFolders.end(); + uuid_vec_t::iterator it = mCompleteFolders.begin(); + uuid_vec_t::iterator end = mCompleteFolders.end(); for(; it != end; ++it) { gInventory.collectDescendentsIf( @@ -2906,7 +2906,7 @@ BOOL LLPostTeleportNotifiers::tick() if ( gAgent.getTeleportState() == LLAgent::TELEPORT_NONE ) { // get callingcards and landmarks available to the user arriving. - LLInventoryFetchDescendentsObserver::folder_ref_t folders; + uuid_vec_t folders; const LLUUID callingcard_id = gInventory.findCategoryUUIDForType(LLFolderType::FT_CALLINGCARD); if(callingcard_id.notNull()) folders.push_back(callingcard_id); @@ -3002,9 +3002,9 @@ void process_teleport_finish(LLMessageSystem* msg, void**) gAgent.setRegion(regionp); gObjectList.shiftObjects(shift_vector); - if (gAgent.getAvatarObject()) + if (isAgentAvatarValid()) { - gAgent.getAvatarObject()->clearChatText(); + gAgentAvatarp->clearChatText(); gAgentCamera.slamLookAt(look_at); } gAgent.setPositionAgent(pos); @@ -3084,8 +3084,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) std::string version_channel; msg->getString("SimData", "ChannelVersion", version_channel); - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (!avatarp) + if (!isAgentAvatarValid()) { // Could happen if you were immediately god-teleported away on login, // maybe other cases. Continue, but warn. @@ -3139,7 +3138,7 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) // know what you look like. gAgent.sendAgentSetAppearance(); - if (avatarp) + if (isAgentAvatarValid()) { // Chat the "back" SLURL. (DEV-4907) @@ -3152,9 +3151,9 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) LLNotificationsUtil::add("SystemMessageTip", args); // Set the new position - avatarp->setPositionAgent(agent_pos); - avatarp->clearChat(); - avatarp->slamPosition(); + gAgentAvatarp->setPositionAgent(agent_pos); + gAgentAvatarp->clearChat(); + gAgentAvatarp->slamPosition(); } } else @@ -3214,9 +3213,9 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) gAgent.clearBusy(); } - if (avatarp) + if (isAgentAvatarValid()) { - avatarp->mFootPlane.clearVec(); + gAgentAvatarp->mFootPlane.clearVec(); } // send walk-vs-run status @@ -4031,7 +4030,7 @@ void process_avatar_animation(LLMessageSystem *mesgsys, void **user_data) //clear animation flags avatarp = (LLVOAvatar *)gObjectList.findObject(uuid); - if (!avatarp) + if (!isAgentAvatarValid()) { // no agent by this ID...error? LL_WARNS("Messaging") << "Received animation state for unknown avatar" << uuid << LL_ENDL; @@ -4117,7 +4116,7 @@ void process_avatar_appearance(LLMessageSystem *mesgsys, void **user_data) mesgsys->getUUIDFast(_PREHASH_Sender, _PREHASH_ID, uuid); LLVOAvatar* avatarp = (LLVOAvatar *)gObjectList.findObject(uuid); - if( avatarp ) + if (avatarp) { avatarp->processAvatarAppearance( mesgsys ); } @@ -4165,9 +4164,7 @@ void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data) BOOL force_mouselook; mesgsys->getBOOLFast(_PREHASH_SitTransform, _PREHASH_ForceMouselook, force_mouselook); - LLVOAvatar* avatar = gAgent.getAvatarObject(); - - if (avatar && dist_vec_squared(camera_eye, camera_at) > 0.0001f) + if (isAgentAvatarValid() && dist_vec_squared(camera_eye, camera_at) > 0.0001f) { gAgentCamera.setSitCamera(sitObjectID, camera_eye, camera_at); } @@ -4178,7 +4175,7 @@ void process_avatar_sit_response(LLMessageSystem *mesgsys, void **user_data) if (object) { LLVector3 sit_spot = object->getPositionAgent() + (sitPosition * object->getRotation()); - if (!use_autopilot || (avatar && avatar->isSitting() && avatar->getRoot() == object->getRoot())) + if (!use_autopilot || isAgentAvatarValid() && gAgentAvatarp->isSitting() && gAgentAvatarp->getRoot() == object->getRoot()) { //we're already sitting on this object, so don't autopilot } @@ -5590,7 +5587,7 @@ void handle_lure(const LLUUID& invitee) } // Prompt for a message to the invited user. -void handle_lure(const std::vector<LLUUID>& ids) +void handle_lure(const uuid_vec_t& ids) { LLSD edit_args; edit_args["REGION"] = gAgent.getRegion()->getName(); diff --git a/indra/newview/llviewermessage.h b/indra/newview/llviewermessage.h index 88f9697037..0ba4ac0c8d 100644 --- a/indra/newview/llviewermessage.h +++ b/indra/newview/llviewermessage.h @@ -157,7 +157,7 @@ void send_group_notice(const LLUUID& group_id, const LLInventoryItem* item); void handle_lure(const LLUUID& invitee); -void handle_lure(const std::vector<LLUUID>& ids); +void handle_lure(const uuid_vec_t& ids); // always from gAgent and // routes through the gAgent's current simulator @@ -201,7 +201,7 @@ void invalid_message_callback(LLMessageSystem*, void*, EMessageException); void process_initiate_download(LLMessageSystem* msg, void**); void start_new_inventory_observer(); -void open_inventory_offer(const std::vector<LLUUID>& items, const std::string& from_name); +void open_inventory_offer(const uuid_vec_t& items, const std::string& from_name); // Returns true if item is not in certain "quiet" folder which don't need UI // notification (e.g. trash, cof, lost-and-found) and agent is not AFK, false otherwise. diff --git a/indra/newview/llviewerobject.cpp b/indra/newview/llviewerobject.cpp index abcb7e5452..8860b734bb 100644 --- a/indra/newview/llviewerobject.cpp +++ b/indra/newview/llviewerobject.cpp @@ -134,7 +134,15 @@ LLViewerObject *LLViewerObject::createObject(const LLUUID &id, const LLPCode pco { if (id == gAgentID) { - res = new LLVOAvatarSelf(id, pcode, regionp); + if (!gAgentAvatarp) + { + gAgentAvatarp = new LLVOAvatarSelf(id, pcode, regionp); + } + else + { + gAgentAvatarp->updateRegion(regionp); + } + res = gAgentAvatarp; } else { @@ -223,7 +231,7 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe mClickAction(0), mAttachmentItemID(LLUUID::null) { - if(!is_global) + if (!is_global) { llassert(mRegionp); } @@ -235,7 +243,7 @@ LLViewerObject::LLViewerObject(const LLUUID &id, const LLPCode pcode, LLViewerRe mPositionRegion = LLVector3(0.f, 0.f, 0.f); - if(!is_global) + if (!is_global && mRegionp) { mPositionAgent = mRegionp->getOriginAgent(); } @@ -377,11 +385,10 @@ void LLViewerObject::markDead() if (flagAnimSource()) { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (avatarp && !avatarp->isDead()) + if (isAgentAvatarValid()) { // stop motions associated with this object - avatarp->stopMotionFromSource(mID); + gAgentAvatarp->stopMotionFromSource(mID); } } @@ -4920,7 +4927,6 @@ void LLViewerObject::setIncludeInSearch(bool include_in_search) void LLViewerObject::setRegion(LLViewerRegion *regionp) { - llassert(regionp); mLatestRecvPacketID = 0; mRegionp = regionp; diff --git a/indra/newview/llviewerobjectlist.cpp b/indra/newview/llviewerobjectlist.cpp index 64a7b2166b..752aeaaab0 100644 --- a/indra/newview/llviewerobjectlist.cpp +++ b/indra/newview/llviewerobjectlist.cpp @@ -474,7 +474,6 @@ void LLViewerObjectList::processObjectUpdate(LLMessageSystem *mesgsys, if (objectp->getRegion() != regionp) { // Object changed region, so update it - objectp->setRegion(regionp); objectp->updateRegion(regionp); // for LLVOAvatar } } @@ -895,6 +894,13 @@ void LLViewerObjectList::removeDrawable(LLDrawable* drawablep) BOOL LLViewerObjectList::killObject(LLViewerObject *objectp) { + // Don't ever kill gAgentAvatarp, just mark it as null region instead. + if (objectp == gAgentAvatarp) + { + objectp->setRegion(NULL); + return FALSE; + } + // When we're killing objects, all we do is mark them as dead. // We clean up the dead objects later. @@ -943,7 +949,8 @@ void LLViewerObjectList::killAllObjects() { objectp = *iter; killObject(objectp); - llassert(objectp->isDead()); + // Object must be dead, or it's the LLVOAvatarSelf which never dies. + llassert((objectp == gAgentAvatarp) || objectp->isDead()); } cleanDeadObjects(FALSE); @@ -1210,11 +1217,10 @@ void LLViewerObjectList::generatePickList(LLCamera &camera) } // add all hud objects to pick list - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (avatarp) + if (isAgentAvatarValid()) { - for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin(); - iter != avatarp->mAttachmentPoints.end(); ) + for (LLVOAvatar::attachment_map_t::iterator iter = gAgentAvatarp->mAttachmentPoints.begin(); + iter != gAgentAvatarp->mAttachmentPoints.end(); ) { LLVOAvatar::attachment_map_t::iterator curiter = iter++; LLViewerJointAttachment* attachment = curiter->second; diff --git a/indra/newview/llviewerwindow.cpp b/indra/newview/llviewerwindow.cpp index 6d2bbb27ee..85c961f34a 100644 --- a/indra/newview/llviewerwindow.cpp +++ b/indra/newview/llviewerwindow.cpp @@ -365,9 +365,9 @@ public: agent_center_text = llformat("AgentCenter %f %f %f", (F32)(tvector.mdV[VX]), (F32)(tvector.mdV[VY]), (F32)(tvector.mdV[VZ])); - if (gAgent.getAvatarObject()) + if (isAgentAvatarValid()) { - tvector = gAgent.getPosGlobalFromAgent(gAgent.getAvatarObject()->mRoot.getWorldPosition()); + tvector = gAgent.getPosGlobalFromAgent(gAgentAvatarp->mRoot.getWorldPosition()); agent_root_center_text = llformat("AgentRootCenter %f %f %f", (F32)(tvector.mdV[VX]), (F32)(tvector.mdV[VY]), (F32)(tvector.mdV[VZ])); } @@ -2272,7 +2272,7 @@ BOOL LLViewerWindow::handleKey(KEY key, MASK mask) } // Try for a new-format gesture - if (LLGestureManager::instance().triggerGesture(key, mask)) + if (LLGestureMgr::instance().triggerGesture(key, mask)) { return TRUE; } @@ -3150,7 +3150,7 @@ void LLViewerWindow::renderSelections( BOOL for_gl_pick, BOOL pick_parcel_walls, // setup HUD render if (selection->getSelectType() == SELECT_TYPE_HUD && LLSelectMgr::getInstance()->getSelection()->getObjectCount()) { - LLBBox hud_bbox = gAgent.getAvatarObject()->getHUDBBox(); + LLBBox hud_bbox = gAgentAvatarp->getHUDBBox(); // set up transform to encompass bounding box of HUD glMatrixMode(GL_PROJECTION); diff --git a/indra/newview/llvoavatar.cpp b/indra/newview/llvoavatar.cpp index 54379dece3..c400e8510e 100644 --- a/indra/newview/llvoavatar.cpp +++ b/indra/newview/llvoavatar.cpp @@ -755,11 +755,6 @@ LLVOAvatar::~LLVOAvatar() { lldebugs << "LLVOAvatar Destructor (0x" << this << ") id:" << mID << llendl; - if (isSelf()) - { - gAgent.setAvatarObject(NULL); - } - mRoot.removeAllChildren(); deleteAndClearArray(mSkeleton); @@ -965,15 +960,14 @@ void LLVOAvatar::dumpBakedStatus() //static void LLVOAvatar::restoreGL() { - LLVOAvatar* self = gAgent.getAvatarObject(); - if (!self) - return; - self->setCompositeUpdatesEnabled(TRUE); - for (U32 i = 0; i < self->mBakedTextureDatas.size(); i++) + if (!isAgentAvatarValid()) return; + + gAgentAvatarp->setCompositeUpdatesEnabled(TRUE); + for (U32 i = 0; i < gAgentAvatarp->mBakedTextureDatas.size(); i++) { - self->invalidateComposite(self->mBakedTextureDatas[i].mTexLayerSet, FALSE); + gAgentAvatarp->invalidateComposite(gAgentAvatarp->mBakedTextureDatas[i].mTexLayerSet, FALSE); } - self->updateMeshTextures(); + gAgentAvatarp->updateMeshTextures(); } //static @@ -2085,7 +2079,7 @@ U32 LLVOAvatar::processUpdateMessage(LLMessageSystem *mesgsys, if(retval & LLViewerObject::INVALID_UPDATE) { - if(this == gAgent.getAvatarObject()) + if (isSelf()) { //tell sim to cancel this update gAgent.teleportViaLocation(gAgent.getPositionGlobal()); @@ -2254,7 +2248,7 @@ void LLVOAvatar::idleUpdateVoiceVisualizer(bool voice_enabled) else { llinfos << "oops - CurrentGesticulationLevel can be only 0, 1, or 2" << llendl; } // this is the call that Karl S. created for triggering gestures from within the code. - LLGestureManager::instance().triggerAndReviseString( gestureString ); + LLGestureMgr::instance().triggerAndReviseString( gestureString ); } } @@ -2547,7 +2541,7 @@ void LLVOAvatar::idleUpdateLoadingEffect() llinfos << "self isFullyLoaded, first_fully_visible" << llendl; first_fully_visible = false; - LLAppearanceManager::instance().onFirstFullyVisible(); + LLAppearanceMgr::instance().onFirstFullyVisible(); } } if (isFullyLoaded()) @@ -6859,8 +6853,7 @@ void LLVOAvatar::useBakedTexture( const LLUUID& id ) // static void LLVOAvatar::dumpArchetypeXML( void* ) { - LLVOAvatar* avatar = gAgent.getAvatarObject(); - LLAPRFile outfile ; + LLAPRFile outfile; outfile.open(gDirUtilp->getExpandedFilename(LL_PATH_CHARACTER,"new archetype.xml"), LL_APR_WB ); apr_file_t* file = outfile.getFileHandle() ; if (!file) @@ -6878,7 +6871,7 @@ void LLVOAvatar::dumpArchetypeXML( void* ) const std::string& wearable_name = LLWearableDictionary::getTypeName((EWearableType)type); apr_file_printf( file, "\n\t\t<!-- wearable: %s -->\n", wearable_name.c_str() ); - for (LLVisualParam* param = avatar->getFirstVisualParam(); param; param = avatar->getNextVisualParam()) + for (LLVisualParam* param = gAgentAvatarp->getFirstVisualParam(); param; param = gAgentAvatarp->getNextVisualParam()) { LLViewerVisualParam* viewer_param = (LLViewerVisualParam*)param; if( (viewer_param->getWearableType() == type) && @@ -6894,7 +6887,7 @@ void LLVOAvatar::dumpArchetypeXML( void* ) if (LLVOAvatarDictionary::getTEWearableType((ETextureIndex)te) == type) { // MULTIPLE_WEARABLES: extend to multiple wearables? - LLViewerTexture* te_image = avatar->getImage((ETextureIndex)te, 0); + LLViewerTexture* te_image = ((LLVOAvatar *)(gAgentAvatarp))->getImage((ETextureIndex)te, 0); if( te_image ) { std::string uuid_str; diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 15be6b23b3..9c2e5461b2 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -67,6 +67,14 @@ #include <boost/lexical_cast.hpp> +LLVOAvatarSelf *gAgentAvatarp = NULL; +BOOL isAgentAvatarValid() +{ + return (gAgentAvatarp && + (gAgentAvatarp->getRegion() != NULL) && + (!gAgentAvatarp->isDead())); +} + using namespace LLVOAvatarDefines; /********************************************************************************* @@ -133,7 +141,6 @@ LLVOAvatarSelf::LLVOAvatarSelf(const LLUUID& id, mLastRegionHandle(0), mRegionCrossingCount(0) { - gAgent.setAvatarObject(this); gAgentWearables.setAvatarObject(this); lldebugs << "Marking avatar as self " << id << llendl; @@ -511,16 +518,17 @@ BOOL LLVOAvatarSelf::buildMenus() return TRUE; } +void LLVOAvatarSelf::cleanup() +{ + markDead(); + delete mScreenp; + mScreenp = NULL; + mRegionp = NULL; +} + LLVOAvatarSelf::~LLVOAvatarSelf() { - // gAgents pointer might have been set to a different Avatar Self, don't get rid of it if so. - if (gAgent.getAvatarObject() == this) - { - gAgent.setAvatarObject(NULL); - gAgentWearables.setAvatarObject(NULL); - } - delete mScreenp; - mScreenp = NULL; + cleanup(); } /** @@ -611,6 +619,17 @@ BOOL LLVOAvatarSelf::updateCharacter(LLAgent &agent) } // virtual +BOOL LLVOAvatarSelf::idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time) +{ + if (!isAgentAvatarValid()) + { + return TRUE; + } + LLVOAvatar::idleUpdate(agent, world, time); + return TRUE; +} + +// virtual LLJoint *LLVOAvatarSelf::getJoint(const std::string &name) { if (mScreenp) @@ -621,7 +640,8 @@ LLJoint *LLVOAvatarSelf::getJoint(const std::string &name) return LLVOAvatar::getJoint(name); } -/*virtual*/ BOOL LLVOAvatarSelf::setVisualParamWeight(LLVisualParam *which_param, F32 weight, BOOL upload_bake ) +// virtual +BOOL LLVOAvatarSelf::setVisualParamWeight(LLVisualParam *which_param, F32 weight, BOOL upload_bake ) { if (!which_param) { @@ -631,7 +651,8 @@ LLJoint *LLVOAvatarSelf::getJoint(const std::string &name) return setParamWeight(param,weight,upload_bake); } -/*virtual*/ BOOL LLVOAvatarSelf::setVisualParamWeight(const char* param_name, F32 weight, BOOL upload_bake ) +// virtual +BOOL LLVOAvatarSelf::setVisualParamWeight(const char* param_name, F32 weight, BOOL upload_bake ) { if (!param_name) { @@ -641,7 +662,8 @@ LLJoint *LLVOAvatarSelf::getJoint(const std::string &name) return setParamWeight(param,weight,upload_bake); } -/*virtual*/ BOOL LLVOAvatarSelf::setVisualParamWeight(S32 index, F32 weight, BOOL upload_bake ) +// virtual +BOOL LLVOAvatarSelf::setVisualParamWeight(S32 index, F32 weight, BOOL upload_bake ) { LLViewerVisualParam *param = (LLViewerVisualParam*) LLCharacter::getVisualParam(index); return setParamWeight(param,weight,upload_bake); @@ -777,7 +799,8 @@ void LLVOAvatarSelf::removeMissingBakedTextures() //virtual void LLVOAvatarSelf::updateRegion(LLViewerRegion *regionp) { - if (regionp->getHandle() != mLastRegionHandle) + setRegion(regionp); + if (!regionp || (regionp->getHandle() != mLastRegionHandle)) { if (mLastRegionHandle != 0) { @@ -791,7 +814,10 @@ void LLVOAvatarSelf::updateRegion(LLViewerRegion *regionp) max = llmax(delta, max); LLViewerStats::getInstance()->setStat(LLViewerStats::ST_CROSSING_MAX, max); } - mLastRegionHandle = regionp->getHandle(); + if (regionp) + { + mLastRegionHandle = regionp->getHandle(); + } } mRegionCrossingTimer.reset(); } @@ -1036,7 +1062,7 @@ const LLViewerJointAttachment *LLVOAvatarSelf::attachObject(LLViewerObject *view if (attachment->isObjectAttached(viewer_object)) { const LLUUID& attachment_id = viewer_object->getItemID(); - LLAppearanceManager::instance().registerAttachment(attachment_id); + LLAppearanceMgr::instance().registerAttachment(attachment_id); } return attachment; @@ -1069,13 +1095,13 @@ BOOL LLVOAvatarSelf::detachObject(LLViewerObject *viewer_object) // Make sure the inventory is in sync with the avatar. // Update COF contents, don't trigger appearance update. - if (gAgent.getAvatarObject() == NULL) + if (!isAgentAvatarValid()) { llinfos << "removeItemLinks skipped, avatar is under destruction" << llendl; } else { - LLAppearanceManager::instance().unregisterAttachment(attachment_id); + LLAppearanceMgr::instance().unregisterAttachment(attachment_id); } return TRUE; @@ -1668,7 +1694,7 @@ void LLVOAvatarSelf::onLocalTextureLoaded(BOOL success, LLViewerFetchedTexture * void LLVOAvatarSelf::dumpTotalLocalTextureByteCount() { S32 gl_bytes = 0; - gAgent.getAvatarObject()->getLocalTextureByteCount(&gl_bytes); + gAgentAvatarp->getLocalTextureByteCount(&gl_bytes); llinfos << "Total Avatar LocTex GL:" << (gl_bytes/1024) << "KB" << llendl; } @@ -1925,9 +1951,7 @@ void LLVOAvatarSelf::processRebakeAvatarTextures(LLMessageSystem* msg, void**) { LLUUID texture_id; msg->getUUID("TextureData", "TextureID", texture_id); - - LLVOAvatarSelf* self = gAgent.getAvatarObject(); - if (!self) return; + if (!isAgentAvatarValid()) return; // If this is a texture corresponding to one of our baked entries, // just rebake that layer set. @@ -1944,13 +1968,13 @@ void LLVOAvatarSelf::processRebakeAvatarTextures(LLMessageSystem* msg, void**) const LLVOAvatarDictionary::TextureEntry *texture_dict = iter->second; if (texture_dict->mIsBakedTexture) { - if (texture_id == self->getTEImage(index)->getID()) + if (texture_id == gAgentAvatarp->getTEImage(index)->getID()) { - LLTexLayerSet* layer_set = self->getLayerSet(index); + LLTexLayerSet* layer_set = gAgentAvatarp->getLayerSet(index); if (layer_set) { llinfos << "TAT: rebake - matched entry " << (S32)index << llendl; - self->invalidateComposite(layer_set, TRUE); + gAgentAvatarp->invalidateComposite(layer_set, TRUE); found = TRUE; LLViewerStats::getInstance()->incStat(LLViewerStats::ST_TEX_REBAKES); } @@ -1961,12 +1985,12 @@ void LLVOAvatarSelf::processRebakeAvatarTextures(LLMessageSystem* msg, void**) // If texture not found, rebake all entries. if (!found) { - self->forceBakeAllTextures(); + gAgentAvatarp->forceBakeAllTextures(); } else { // Not sure if this is necessary, but forceBakeAllTextures() does it. - self->updateMeshTextures(); + gAgentAvatarp->updateMeshTextures(); } } @@ -2046,10 +2070,9 @@ void LLVOAvatarSelf::onCustomizeStart() // static void LLVOAvatarSelf::onCustomizeEnd() { - LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); - if (avatarp) + if (isAgentAvatarValid()) { - avatarp->invalidateAll(); + gAgentAvatarp->invalidateAll(); } } diff --git a/indra/newview/llvoavatarself.h b/indra/newview/llvoavatarself.h index 9514abc5bc..4960d4d103 100644 --- a/indra/newview/llvoavatarself.h +++ b/indra/newview/llvoavatarself.h @@ -55,7 +55,8 @@ public: LLVOAvatarSelf(const LLUUID &id, const LLPCode pcode, LLViewerRegion *regionp); virtual ~LLVOAvatarSelf(); virtual void markDead(); - virtual void initInstance(); // Called after construction to initialize the class. + virtual void initInstance(); // Called after construction to initialize the class. + void cleanup(); protected: /*virtual*/ BOOL loadAvatar(); BOOL loadAvatarSelf(); @@ -77,6 +78,7 @@ protected: //-------------------------------------------------------------------- public: /*virtual*/ void updateRegion(LLViewerRegion *regionp); + /*virtual*/ BOOL idleUpdate(LLAgent &agent, LLWorld &world, const F64 &time); //-------------------------------------------------------------------- // LLCharacter interface and related @@ -333,4 +335,8 @@ public: }; +extern LLVOAvatarSelf *gAgentAvatarp; + +BOOL isAgentAvatarValid(); + #endif // LL_VO_AVATARSELF_H diff --git a/indra/newview/llvoiceclient.cpp b/indra/newview/llvoiceclient.cpp index cc346c2345..d8319f3cc3 100644 --- a/indra/newview/llvoiceclient.cpp +++ b/indra/newview/llvoiceclient.cpp @@ -87,6 +87,12 @@ static bool sConnectingToAgni = false; F32 LLVoiceClient::OVERDRIVEN_POWER_LEVEL = 0.7f; +const F32 LLVoiceClient::VOLUME_MIN = 0.f; +const F32 LLVoiceClient::VOLUME_DEFAULT = 0.5f; +const F32 LLVoiceClient::VOLUME_MAX = 1.0f; + +const F32 VOLUME_SCALE_VIVOX = 0.01f; + const F32 SPEAKING_TIMEOUT = 1.f; const int VOICE_MAJOR_VERSION = 1; @@ -1112,24 +1118,28 @@ class LLSpeakerVolumeStorage : public LLSingleton<LLSpeakerVolumeStorage> public: /** - * Sets internal voluem level for specified user. + * Stores volume level for specified user. * - * @param[in] speaker_id - LLUUID of user to store volume level for - * @param[in] volume - external (vivox) volume level to be stored for user. + * @param[in] speaker_id - LLUUID of user to store volume level for. + * @param[in] volume - volume level to be stored for user. */ void storeSpeakerVolume(const LLUUID& speaker_id, F32 volume); /** - * Gets stored external (vivox) volume level for specified speaker and - * transforms it into internal (viewer) level. + * Gets stored volume level for specified speaker * - * If specified user is not found -1 will be returned. - * Internal level is calculated as: internal = 400 * external^2 - * Maps 0.0 to 1.0 to internal values 0-400 + * @param[in] speaker_id - LLUUID of user to retrieve volume level for. + * @param[out] volume - set to stored volume if found, otherwise unmodified. + * @return - true if a stored volume is found. + */ + bool getSpeakerVolume(const LLUUID& speaker_id, F32& volume); + + /** + * Removes stored volume level for specified user. * - * @param[in] speaker_id - LLUUID of user to get his volume level + * @param[in] speaker_id - LLUUID of user to remove. */ - S32 getSpeakerVolume(const LLUUID& speaker_id); + void removeSpeakerVolume(const LLUUID& speaker_id); private: friend class LLSingleton<LLSpeakerVolumeStorage>; @@ -1141,6 +1151,9 @@ private: void load(); void save(); + static F32 LLSpeakerVolumeStorage::transformFromLegacyVolume(F32 volume_in); + static F32 LLSpeakerVolumeStorage::transformToLegacyVolume(F32 volume_in); + typedef std::map<LLUUID, F32> speaker_data_map_t; speaker_data_map_t mSpeakersData; }; @@ -1159,23 +1172,85 @@ LLSpeakerVolumeStorage::~LLSpeakerVolumeStorage() void LLSpeakerVolumeStorage::storeSpeakerVolume(const LLUUID& speaker_id, F32 volume) { - mSpeakersData[speaker_id] = volume; + if ((volume >= LLVoiceClient::VOLUME_MIN) && (volume <= LLVoiceClient::VOLUME_MAX)) + { + mSpeakersData[speaker_id] = volume; + + // Enable this when debugging voice slider issues. It's way to spammy even for debug-level logging. + // LL_DEBUGS("Voice") << "Stored volume = " << volume << " for " << id << LL_ENDL; + } + else + { + LL_WARNS("Voice") << "Attempted to store out of range volume " << volume << " for " << speaker_id << LL_ENDL; + llassert(0); + } } -S32 LLSpeakerVolumeStorage::getSpeakerVolume(const LLUUID& speaker_id) +bool LLSpeakerVolumeStorage::getSpeakerVolume(const LLUUID& speaker_id, F32& volume) { - // Return value of -1 indicates no level is stored for this speaker - S32 ret_val = -1; speaker_data_map_t::const_iterator it = mSpeakersData.find(speaker_id); if (it != mSpeakersData.end()) { - F32 f_val = it->second; - // volume can amplify by as much as 4x! - S32 ivol = (S32)(400.f * f_val * f_val); - ret_val = llclamp(ivol, 0, 400); + volume = it->second; + + // Enable this when debugging voice slider issues. It's way to spammy even for debug-level logging. + // LL_DEBUGS("Voice") << "Retrieved stored volume = " << volume << " for " << id << LL_ENDL; + + return true; } - return ret_val; + + return false; +} + +void LLSpeakerVolumeStorage::removeSpeakerVolume(const LLUUID& speaker_id) +{ + mSpeakersData.erase(speaker_id); + + // Enable this when debugging voice slider issues. It's way to spammy even for debug-level logging. + // LL_DEBUGS("Voice") << "Removing stored volume for " << id << LL_ENDL; +} + +/* static */ F32 LLSpeakerVolumeStorage::transformFromLegacyVolume(F32 volume_in) +{ + // Convert to linear-logarithmic [0.0..1.0] with 0.5 = 0dB + // from legacy characteristic composed of two square-curves + // that intersect at volume_in = 0.5, volume_out = 0.56 + + F32 volume_out = 0.f; + volume_in = llclamp(volume_in, 0.f, 1.0f); + + if (volume_in <= 0.5f) + { + volume_out = volume_in * volume_in * 4.f * 0.56f; + } + else + { + volume_out = (1.f - 0.56f) * (4.f * volume_in * volume_in - 1.f) / 3.f + 0.56f; + } + + return volume_out; +} + +/* static */ F32 LLSpeakerVolumeStorage::transformToLegacyVolume(F32 volume_in) +{ + // Convert from linear-logarithmic [0.0..1.0] with 0.5 = 0dB + // to legacy characteristic composed of two square-curves + // that intersect at volume_in = 0.56, volume_out = 0.5 + + F32 volume_out = 0.f; + volume_in = llclamp(volume_in, 0.f, 1.0f); + + if (volume_in <= 0.56f) + { + volume_out = sqrt(volume_in / (4.f * 0.56f)); + } + else + { + volume_out = sqrt((3.f * (volume_in - 0.56f) / (1.f - 0.56f) + 1.f) / 4.f); + } + + return volume_out; } void LLSpeakerVolumeStorage::load() @@ -1183,6 +1258,8 @@ void LLSpeakerVolumeStorage::load() // load per-resident voice volume information std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, SETTINGS_FILE_NAME); + LL_INFOS("Voice") << "Loading stored speaker volumes from: " << filename << LL_ENDL; + LLSD settings_llsd; llifstream file; file.open(filename); @@ -1194,7 +1271,10 @@ void LLSpeakerVolumeStorage::load() for (LLSD::map_const_iterator iter = settings_llsd.beginMap(); iter != settings_llsd.endMap(); ++iter) { - mSpeakersData.insert(std::make_pair(LLUUID(iter->first), (F32)iter->second.asReal())); + // Maintain compatibility with 1.23 non-linear saved volume levels + F32 volume = transformFromLegacyVolume((F32)iter->second.asReal()); + + storeSpeakerVolume(LLUUID(iter->first), volume); } } @@ -1209,9 +1289,14 @@ void LLSpeakerVolumeStorage::save() std::string filename = gDirUtilp->getExpandedFilename(LL_PATH_PER_SL_ACCOUNT, SETTINGS_FILE_NAME); LLSD settings_llsd; + LL_INFOS("Voice") << "Saving stored speaker volumes to: " << filename << LL_ENDL; + for(speaker_data_map_t::const_iterator iter = mSpeakersData.begin(); iter != mSpeakersData.end(); ++iter) { - settings_llsd[iter->first.asString()] = iter->second; + // Maintain compatibility with 1.23 non-linear saved volume levels + F32 volume = transformToLegacyVolume(iter->second); + + settings_llsd[iter->first.asString()] = volume; } llofstream file; @@ -2420,9 +2505,10 @@ void LLVoiceClient::stateMachine() enforceTether(); } - // Send an update if the ptt state has changed (which shouldn't be able to happen that often -- the user can only click so fast) - // or every 10hz, whichever is sooner. - if((mAudioSession && mAudioSession->mVolumeDirty) || mPTTDirty || mSpeakerVolumeDirty || mUpdateTimer.hasExpired()) + // Send an update only if the ptt or mute state has changed (which shouldn't be able to happen that often + // -- the user can only click so fast) or every 10hz, whichever is sooner. + // Sending for every volume update causes an excessive flood of messages whenever a volume slider is dragged. + if((mAudioSession && mAudioSession->mMuteDirty) || mPTTDirty || mUpdateTimer.hasExpired()) { mUpdateTimer.setTimerExpirySec(UPDATE_THROTTLE_SECONDS); sendPositionalUpdate(); @@ -3417,38 +3503,26 @@ void LLVoiceClient::sendPositionalUpdate(void) stream << "</Request>\n\n\n"; } - if(mAudioSession && mAudioSession->mVolumeDirty) + if(mAudioSession && (mAudioSession->mVolumeDirty || mAudioSession->mMuteDirty)) { participantMap::iterator iter = mAudioSession->mParticipantsByURI.begin(); mAudioSession->mVolumeDirty = false; + mAudioSession->mMuteDirty = false; for(; iter != mAudioSession->mParticipantsByURI.end(); iter++) { participantState *p = iter->second; - + if(p->mVolumeDirty) { // Can't set volume/mute for yourself if(!p->mIsSelf) { - int volume = 56; // nominal default value + // scale from the range 0.0-1.0 to vivox volume in the range 0-100 + S32 volume = llround(p->mVolume / VOLUME_SCALE_VIVOX); + bool mute = p->mOnMuteList; - - if(p->mUserVolume != -1) - { - // scale from user volume in the range 0-400 (with 100 as "normal") to vivox volume in the range 0-100 (with 56 as "normal") - if(p->mUserVolume < 100) - volume = (p->mUserVolume * 56) / 100; - else - volume = (((p->mUserVolume - 100) * (100 - 56)) / 300) + 56; - } - else if(p->mVolume != -1) - { - // Use the previously reported internal volume (comes in with a ParticipantUpdatedEvent) - volume = p->mVolume; - } - if(mute) { @@ -3456,10 +3530,16 @@ void LLVoiceClient::sendPositionalUpdate(void) // If we want the user to be muted, set their volume to 0 as well. // This isn't perfect, but it will at least reduce their volume to a minimum. volume = 0; + + // Mark the current volume level as set to prevent incoming events + // changing it to 0, so that we can return to it when unmuting. + p->mVolumeSet = true; } - + if(volume == 0) + { mute = true; + } LL_DEBUGS("Voice") << "Setting volume/mute for avatar " << p->mAvatarID << " to " << volume << (mute?"/true":"/false") << LL_ENDL; @@ -4600,16 +4680,13 @@ void LLVoiceClient::participantUpdatedEvent( participant->mPower = 0.0f; } - // *HACK: Minimal hack to fix EXT-6508, ignore the incoming volume if it is zero. - // This happens because we send volume zero to Vivox when someone is muted, - // Vivox then send it back to us, overwriting the previous volume. - // Remove this hack once volume refactoring from EXT-6031 is applied. - if (volume != 0) + // Ignore incoming volume level if it has been explicitly set, or there + // is a volume or mute change pending. + if ( !participant->mVolumeSet && !participant->mVolumeDirty) { - participant->mVolume = volume; + participant->mVolume = (F32)volume * VOLUME_SCALE_VIVOX; } - // *HACK: mantipov: added while working on EXT-3544 /* Sometimes LLVoiceClient::participantUpdatedEvent callback is called BEFORE @@ -4993,7 +5070,7 @@ void LLVoiceClient::muteListChanged() // Check to see if this participant is on the mute list already if(p->updateMuteState()) - mAudioSession->mVolumeDirty = true; + mAudioSession->mMuteDirty = true; } } } @@ -5016,10 +5093,10 @@ LLVoiceClient::participantState::participantState(const std::string &uri) : mIsModeratorMuted(false), mLastSpokeTimestamp(0.f), mPower(0.f), - mVolume(-1), - mOnMuteList(false), - mUserVolume(-1), - mVolumeDirty(false), + mVolume(VOLUME_DEFAULT), + mOnMuteList(false), + mVolumeSet(false), + mVolumeDirty(false), mAvatarIDValid(false), mIsSelf(false) { @@ -5068,7 +5145,7 @@ LLVoiceClient::participantState *LLVoiceClient::sessionState::addParticipant(con result->mAvatarID = id; if(result->updateMuteState()) - mVolumeDirty = true; + mMuteDirty = true; } else { @@ -5080,8 +5157,7 @@ LLVoiceClient::participantState *LLVoiceClient::sessionState::addParticipant(con mParticipantsByUUID.insert(participantUUIDMap::value_type(&(result->mAvatarID), result)); - result->mUserVolume = LLSpeakerVolumeStorage::getInstance()->getSpeakerVolume(result->mAvatarID); - if (result->mUserVolume != -1) + if (LLSpeakerVolumeStorage::getInstance()->getSpeakerVolume(result->mAvatarID, result->mVolume)) { result->mVolumeDirty = true; mVolumeDirty = true; @@ -5872,12 +5948,10 @@ void LLVoiceClient::enforceTether(void) void LLVoiceClient::updatePosition(void) { - if(gVoiceClient) { - LLVOAvatarSelf *avatarp = gAgent.getAvatarObject(); LLViewerRegion *region = gAgent.getRegion(); - if(region && avatarp) + if(region && isAgentAvatarValid()) { LLMatrix3 rot; LLVector3d pos; @@ -5895,9 +5969,9 @@ void LLVoiceClient::updatePosition(void) rot); // rotation matrix // Send the current avatar position to the voice code - rot = avatarp->getRootJoint()->getWorldRotation().getMatrix3(); + rot = gAgentAvatarp->getRootJoint()->getWorldRotation().getMatrix3(); - pos = avatarp->getPositionGlobal(); + pos = gAgentAvatarp->getPositionGlobal(); // TODO: Can we get the head offset from outside the LLVOAvatar? // pos += LLVector3d(mHeadOffset); pos += LLVector3d(0.f, 0.f, 1.f); @@ -6281,51 +6355,21 @@ BOOL LLVoiceClient::getOnMuteList(const LLUUID& id) return result; } -// External accessiors. Maps 0.0 to 1.0 to internal values 0-400 with .5 == 100 -// internal = 400 * external^2 +// External accessors. F32 LLVoiceClient::getUserVolume(const LLUUID& id) { - F32 result = 0.0f; + // Minimum volume will be returned for users with voice disabled + F32 result = VOLUME_MIN; participantState *participant = findParticipantByID(id); if(participant) { - S32 ires = 100; // nominal default volume - - if(participant->mIsSelf) - { - // Always make it look like the user's own volume is set at the default. - } - else if(participant->mUserVolume != -1) - { - // Use the internal volume - ires = participant->mUserVolume; - - // Enable this when debugging voice slider issues. It's way to spammy even for debug-level logging. -// LL_DEBUGS("Voice") << "mapping from mUserVolume " << ires << LL_ENDL; - } - else if(participant->mVolume != -1) - { - // Map backwards from vivox volume - - // Enable this when debugging voice slider issues. It's way to spammy even for debug-level logging. -// LL_DEBUGS("Voice") << "mapping from mVolume " << participant->mVolume << LL_ENDL; + result = participant->mVolume; - if(participant->mVolume < 56) - { - ires = (participant->mVolume * 100) / 56; - } - else - { - ires = (((participant->mVolume - 56) * 300) / (100 - 56)) + 100; - } - } - result = sqrtf(((F32)ires) / 400.f); + // Enable this when debugging voice slider issues. It's way to spammy even for debug-level logging. + // LL_DEBUGS("Voice") << "mVolume = " << result << " for " << id << LL_ENDL; } - // Enable this when debugging voice slider issues. It's way to spammy even for debug-level logging. -// LL_DEBUGS("Voice") << "returning " << result << LL_ENDL; - return result; } @@ -6334,16 +6378,23 @@ void LLVoiceClient::setUserVolume(const LLUUID& id, F32 volume) if(mAudioSession) { participantState *participant = findParticipantByID(id); - if (participant) + if (participant && !participant->mIsSelf) { - // store this volume setting for future sessions - LLSpeakerVolumeStorage::getInstance()->storeSpeakerVolume(id, volume); + if (!is_approx_equal(volume, VOLUME_DEFAULT)) + { + // Store this volume setting for future sessions if it has been + // changed from the default + LLSpeakerVolumeStorage::getInstance()->storeSpeakerVolume(id, volume); + } + else + { + // Remove stored volume setting if it is returned to the default + LLSpeakerVolumeStorage::getInstance()->removeSpeakerVolume(id); + } - // volume can amplify by as much as 4x! - S32 ivol = (S32)(400.f * volume * volume); - participant->mUserVolume = llclamp(ivol, 0, 400); - participant->mVolumeDirty = TRUE; - mAudioSession->mVolumeDirty = TRUE; + participant->mVolume = llclamp(volume, VOLUME_MIN, VOLUME_MAX); + participant->mVolumeDirty = true; + mAudioSession->mVolumeDirty = true; } } } @@ -6484,6 +6535,7 @@ LLVoiceClient::sessionState::sessionState() : mVoiceEnabled(false), mReconnect(false), mVolumeDirty(false), + mMuteDirty(false), mParticipantsChanged(false) { } diff --git a/indra/newview/llvoiceclient.h b/indra/newview/llvoiceclient.h index aaacab69e0..a29c386182 100644 --- a/indra/newview/llvoiceclient.h +++ b/indra/newview/llvoiceclient.h @@ -101,6 +101,10 @@ class LLVoiceClient: public LLSingleton<LLVoiceClient> static F32 OVERDRIVEN_POWER_LEVEL; + static const F32 VOLUME_MIN; + static const F32 VOLUME_DEFAULT; + static const F32 VOLUME_MAX; + void updateSettings(); // call after loading settings and whenever they change void getCaptureDevicesSendMessage(); @@ -269,7 +273,7 @@ static void updatePosition(void); public: participantState(const std::string &uri); - bool updateMuteState(); + bool updateMuteState(); // true if mute state has changed bool isAvatar(); std::string mURI; @@ -279,13 +283,13 @@ static void updatePosition(void); LLFrameTimer mSpeakingTimeout; F32 mLastSpokeTimestamp; F32 mPower; - int mVolume; + F32 mVolume; std::string mGroupID; - int mUserVolume; bool mPTT; bool mIsSpeaking; bool mIsModeratorMuted; bool mOnMuteList; // true if this avatar is on the user's mute list (and should be muted) + bool mVolumeSet; // true if incoming volume messages should not change the volume bool mVolumeDirty; // true if this participant needs a volume command sent (either mOnMuteList or mUserVolume has changed) bool mAvatarIDValid; bool mIsSelf; @@ -349,6 +353,7 @@ static void updatePosition(void); // Set to true when the mute state of someone in the participant list changes. // The code will have to walk the list to find the changed participant(s). bool mVolumeDirty; + bool mMuteDirty; bool mParticipantsChanged; participantMap mParticipantsByURI; diff --git a/indra/newview/llvovolume.cpp b/indra/newview/llvovolume.cpp index cb362d557c..6b052b8e99 100644 --- a/indra/newview/llvovolume.cpp +++ b/indra/newview/llvovolume.cpp @@ -369,7 +369,7 @@ U32 LLVOVolume::processUpdateMessage(LLMessageSystem *mesgsys, S32 res2 = unpackTEMessage(*dp); if (TEM_INVALID == res2) { - // Well, crap, there's something bogus in the data that we're unpacking. + // There's something bogus in the data that we're unpacking. dp->dumpBufferToLog(); llwarns << "Flushing cache files" << llendl; std::string mask; diff --git a/indra/newview/llwearable.cpp b/indra/newview/llwearable.cpp index 589099673d..63f99273fe 100644 --- a/indra/newview/llwearable.cpp +++ b/indra/newview/llwearable.cpp @@ -62,13 +62,12 @@ class LLOverrideBakedTextureUpdate public: LLOverrideBakedTextureUpdate(bool temp_state) { - mAvatar = gAgent.getAvatarObject(); U32 num_bakes = (U32) LLVOAvatarDefines::BAKED_NUM_INDICES; for( U32 index = 0; index < num_bakes; ++index ) { - composite_enabled[index] = mAvatar->isCompositeUpdateEnabled(index); + composite_enabled[index] = gAgentAvatarp->isCompositeUpdateEnabled(index); } - mAvatar->setCompositeUpdatesEnabled(temp_state); + gAgentAvatarp->setCompositeUpdatesEnabled(temp_state); } ~LLOverrideBakedTextureUpdate() @@ -76,13 +75,11 @@ public: U32 num_bakes = (U32)LLVOAvatarDefines::BAKED_NUM_INDICES; for( U32 index = 0; index < num_bakes; ++index ) { - mAvatar->setCompositeUpdatesEnabled(index, composite_enabled[index]); - } + gAgentAvatarp->setCompositeUpdatesEnabled(index, composite_enabled[index]); + } } - private: bool composite_enabled[LLVOAvatarDefines::BAKED_NUM_INDICES]; - LLVOAvatarSelf *mAvatar; }; // Private local functions @@ -205,10 +202,9 @@ BOOL LLWearable::exportFile(LLFILE* file) const void LLWearable::createVisualParams() { - LLVOAvatar* avatar = gAgent.getAvatarObject(); - for (LLViewerVisualParam* param = (LLViewerVisualParam*) avatar->getFirstVisualParam(); + for (LLViewerVisualParam* param = (LLViewerVisualParam*) gAgentAvatarp->getFirstVisualParam(); param; - param = (LLViewerVisualParam*) avatar->getNextVisualParam()) + param = (LLViewerVisualParam*) gAgentAvatarp->getNextVisualParam()) { if (param->getWearableType() == mType) { @@ -228,7 +224,7 @@ void LLWearable::createVisualParams() param->resetDrivenParams(); if(!param->linkDrivenParams(boost::bind(wearable_function,(LLWearable*)this, _1), false)) { - if( !param->linkDrivenParams(boost::bind(avatar_function,(LLVOAvatarSelf*)avatar,_1 ), true)) + if( !param->linkDrivenParams(boost::bind(avatar_function,gAgentAvatarp,_1 ), true)) { llwarns << "could not link driven params for wearable " << getName() << " id: " << param->getID() << llendl; continue; @@ -464,12 +460,7 @@ BOOL LLWearable::importFile( LLFILE* file ) // since this wearable was created. BOOL LLWearable::isOldVersion() const { - LLVOAvatar* avatar = gAgent.getAvatarObject(); - llassert( avatar ); - if( !avatar ) - { - return FALSE; - } + if (!isAgentAvatarValid()) return FALSE; if( LLWearable::sCurrentDefinitionVersion < mDefinitionVersion ) { @@ -483,9 +474,9 @@ BOOL LLWearable::isOldVersion() const } S32 param_count = 0; - for( LLViewerVisualParam* param = (LLViewerVisualParam*) avatar->getFirstVisualParam(); + for( LLViewerVisualParam* param = (LLViewerVisualParam*) gAgentAvatarp->getFirstVisualParam(); param; - param = (LLViewerVisualParam*) avatar->getNextVisualParam() ) + param = (LLViewerVisualParam*) gAgentAvatarp->getNextVisualParam() ) { if( (param->getWearableType() == mType) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) ) { @@ -531,17 +522,11 @@ BOOL LLWearable::isOldVersion() const // only if those values are the same as the defaults. BOOL LLWearable::isDirty() const { - LLVOAvatar* avatar = gAgent.getAvatarObject(); - llassert( avatar ); - if( !avatar ) - { - return FALSE; - } - + if (!isAgentAvatarValid()) return FALSE; - for( LLViewerVisualParam* param = (LLViewerVisualParam*) avatar->getFirstVisualParam(); + for( LLViewerVisualParam* param = (LLViewerVisualParam*) gAgentAvatarp->getFirstVisualParam(); param; - param = (LLViewerVisualParam*) avatar->getNextVisualParam() ) + param = (LLViewerVisualParam*) gAgentAvatarp->getNextVisualParam() ) { if( (param->getWearableType() == mType) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) @@ -602,14 +587,9 @@ BOOL LLWearable::isDirty() const void LLWearable::setParamsToDefaults() { - LLVOAvatar* avatar = gAgent.getAvatarObject(); - llassert( avatar ); - if( !avatar ) - { - return; - } + if (!isAgentAvatarValid()) return; - for( LLVisualParam* param = avatar->getFirstVisualParam(); param; param = avatar->getNextVisualParam() ) + for( LLVisualParam* param = gAgentAvatarp->getFirstVisualParam(); param; param = gAgentAvatarp->getNextVisualParam() ) { if( (((LLViewerVisualParam*)param)->getWearableType() == mType ) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) ) { @@ -645,18 +625,12 @@ void LLWearable::setTexturesToDefaults() // Updates the user's avatar's appearance void LLWearable::writeToAvatar() { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - llassert(avatarp); - if(!avatarp) - { - llerrs << "could not get avatar object to write to for wearable " << this->getName() << llendl; - return; - } + if (!isAgentAvatarValid()) return; - ESex old_sex = avatarp->getSex(); + ESex old_sex = gAgentAvatarp->getSex(); // Pull params - for( LLVisualParam* param = avatarp->getFirstVisualParam(); param; param = avatarp->getNextVisualParam() ) + for( LLVisualParam* param = gAgentAvatarp->getFirstVisualParam(); param; param = gAgentAvatarp->getNextVisualParam() ) { // cross-wearable parameters are not authoritative, as they are driven by a different wearable. So don't copy the values to the // avatar object if cross wearable. Cross wearable params get their values from the avatar, they shouldn't write the other way. @@ -665,7 +639,7 @@ void LLWearable::writeToAvatar() S32 param_id = param->getID(); F32 weight = getVisualParamWeight(param_id); - avatarp->setVisualParamWeight( param_id, weight, FALSE ); + gAgentAvatarp->setVisualParamWeight( param_id, weight, FALSE ); } } @@ -686,14 +660,14 @@ void LLWearable::writeToAvatar() } LLViewerTexture* image = LLViewerTextureManager::getFetchedTexture( image_id, TRUE, LLViewerTexture::BOOST_NONE, LLViewerTexture::LOD_TEXTURE ); // MULTI-WEARABLE: replace hard-coded 0 - avatarp->setLocalTextureTE(te, image, 0); + gAgentAvatarp->setLocalTextureTE(te, image, 0); } } - ESex new_sex = avatarp->getSex(); + ESex new_sex = gAgentAvatarp->getSex(); if( old_sex != new_sex ) { - avatarp->updateSexDependentLayerSets( FALSE ); + gAgentAvatarp->updateSexDependentLayerSets( FALSE ); } // if( upload_bake ) @@ -707,12 +681,7 @@ void LLWearable::writeToAvatar() // static void LLWearable::removeFromAvatar( EWearableType type, BOOL upload_bake ) { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - llassert(avatarp); - if(!avatarp) - { - return; - } + if (!isAgentAvatarValid()) return; // You can't just remove body parts. if( (type == WT_SHAPE) || @@ -724,12 +693,12 @@ void LLWearable::removeFromAvatar( EWearableType type, BOOL upload_bake ) } // Pull params - for( LLVisualParam* param = avatarp->getFirstVisualParam(); param; param = avatarp->getNextVisualParam() ) + for( LLVisualParam* param = gAgentAvatarp->getFirstVisualParam(); param; param = gAgentAvatarp->getNextVisualParam() ) { if( (((LLViewerVisualParam*)param)->getWearableType() == type) && (param->getGroup() == VISUAL_PARAM_GROUP_TWEAKABLE ) ) { S32 param_id = param->getID(); - avatarp->setVisualParamWeight( param_id, param->getDefaultWeight(), upload_bake ); + gAgentAvatarp->setVisualParamWeight( param_id, param->getDefaultWeight(), upload_bake ); } } @@ -738,8 +707,8 @@ void LLWearable::removeFromAvatar( EWearableType type, BOOL upload_bake ) gFloaterCustomize->setWearable(type, NULL, PERM_ALL, TRUE); } - avatarp->updateVisualParams(); - avatarp->wearableUpdated(type, TRUE); + gAgentAvatarp->updateVisualParams(); + gAgentAvatarp->wearableUpdated(type, TRUE); // if( upload_bake ) // { @@ -751,12 +720,7 @@ void LLWearable::removeFromAvatar( EWearableType type, BOOL upload_bake ) // Definition version is current: removes obsolete enties and creates default values for new ones. void LLWearable::copyDataFrom(const LLWearable* src) { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - llassert(avatarp); - if(!avatarp) - { - return; - } + if (!isAgentAvatarValid()) return; mDefinitionVersion = LLWearable::sCurrentDefinitionVersion; @@ -769,9 +733,9 @@ void LLWearable::copyDataFrom(const LLWearable* src) mSavedVisualParamMap.clear(); // Deep copy of mVisualParamMap (copies only those params that are current, filling in defaults where needed) - for (LLViewerVisualParam* param = (LLViewerVisualParam*) avatarp->getFirstVisualParam(); + for (LLViewerVisualParam* param = (LLViewerVisualParam*) gAgentAvatarp->getFirstVisualParam(); param; - param = (LLViewerVisualParam*) avatarp->getNextVisualParam() ) + param = (LLViewerVisualParam*) gAgentAvatarp->getNextVisualParam() ) { if( (param->getWearableType() == mType) ) { @@ -876,14 +840,12 @@ void LLWearable::addVisualParam(LLVisualParam *param) void LLWearable::setVisualParams() { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - for (visual_param_index_map_t::const_iterator iter = mVisualParamIndexMap.begin(); iter != mVisualParamIndexMap.end(); iter++) { S32 id = iter->first; LLVisualParam *wearable_param = iter->second; F32 value = wearable_param->getWeight(); - avatarp->setVisualParamWeight(id, value, FALSE); + gAgentAvatarp->setVisualParamWeight(id, value, FALSE); } } @@ -1024,8 +986,7 @@ BOOL LLWearable::isOnTop() const void LLWearable::createLayers(S32 te) { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - LLTexLayerSet *layer_set = avatarp->getLayerSet((ETextureIndex)te); + LLTexLayerSet *layer_set = gAgentAvatarp->getLayerSet((ETextureIndex)te); if (layer_set) { layer_set->cloneTemplates(mTEMap[te], (ETextureIndex)te, this); @@ -1123,10 +1084,9 @@ void LLWearable::destroyTextures() void LLWearable::pullCrossWearableValues() { // scan through all of the avatar's visual parameters - LLVOAvatar* avatar = gAgent.getAvatarObject(); - for (LLViewerVisualParam* param = (LLViewerVisualParam*) avatar->getFirstVisualParam(); + for (LLViewerVisualParam* param = (LLViewerVisualParam*) gAgentAvatarp->getFirstVisualParam(); param; - param = (LLViewerVisualParam*) avatar->getNextVisualParam()) + param = (LLViewerVisualParam*) gAgentAvatarp->getNextVisualParam()) { if( param ) { diff --git a/indra/newview/llworld.cpp b/indra/newview/llworld.cpp index 19f303ab88..0b63f5efbd 100644 --- a/indra/newview/llworld.cpp +++ b/indra/newview/llworld.cpp @@ -1209,7 +1209,7 @@ static LLVector3d unpackLocalToGlobalPosition(U32 compact_local, const LLVector3 return pos_global; } -void LLWorld::getAvatars(std::vector<LLUUID>* avatar_ids, std::vector<LLVector3d>* positions, const LLVector3d& relative_to, F32 radius) const +void LLWorld::getAvatars(uuid_vec_t* avatar_ids, std::vector<LLVector3d>* positions, const LLVector3d& relative_to, F32 radius) const { if(avatar_ids != NULL) { diff --git a/indra/newview/llworld.h b/indra/newview/llworld.h index 48025c700b..502f7b0320 100644 --- a/indra/newview/llworld.h +++ b/indra/newview/llworld.h @@ -158,7 +158,7 @@ public: // All arguments are optional. Given containers will be emptied and then filled. // Not supplying origin or radius input returns data on all avatars in the known regions. void getAvatars( - std::vector<LLUUID>* avatar_ids = NULL, + uuid_vec_t* avatar_ids = NULL, std::vector<LLVector3d>* positions = NULL, const LLVector3d& relative_to = LLVector3d(), F32 radius = FLT_MAX) const; diff --git a/indra/newview/pipeline.cpp b/indra/newview/pipeline.cpp index 685be043fc..4ca251af3e 100644 --- a/indra/newview/pipeline.cpp +++ b/indra/newview/pipeline.cpp @@ -3856,15 +3856,14 @@ void LLPipeline::renderForSelect(std::set<LLViewerObject*>& objects, BOOL render } // pick HUD objects - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - if (avatarp && sShowHUDAttachments) + if (isAgentAvatarValid() && sShowHUDAttachments) { glh::matrix4f save_proj(glh_get_current_projection()); glh::matrix4f save_model(glh_get_current_modelview()); setup_hud_matrices(screen_rect); - for (LLVOAvatar::attachment_map_t::iterator iter = avatarp->mAttachmentPoints.begin(); - iter != avatarp->mAttachmentPoints.end(); ) + for (LLVOAvatar::attachment_map_t::iterator iter = gAgentAvatarp->mAttachmentPoints.begin(); + iter != gAgentAvatarp->mAttachmentPoints.end(); ) { LLVOAvatar::attachment_map_t::iterator curiter = iter++; LLViewerJointAttachment* attachment = curiter->second; @@ -3964,9 +3963,9 @@ void LLPipeline::rebuildPools() max_count--; } - if (gAgent.getAvatarObject()) + if (isAgentAvatarValid()) { - gAgent.getAvatarObject()->rebuildHUD(); + gAgentAvatarp->rebuildHUD(); } } @@ -4598,8 +4597,8 @@ void LLPipeline::setupHWLights(LLDrawPool* pool) glLightfv(gllight, GL_SPECULAR, LLColor4::black.mV); } - if (gAgent.getAvatarObject() && - gAgent.getAvatarObject()->mSpecialRenderMode == 3) + if (isAgentAvatarValid() && + gAgentAvatarp->mSpecialRenderMode == 3) { LLColor4 light_color = LLColor4::white; light_color.mV[3] = 0.0f; @@ -4708,15 +4707,13 @@ void LLPipeline::enableLightsDynamic() glColor4f(0.f, 0.f, 0.f, 1.f); // no local lighting by default } - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); - - if (avatarp && getLightingDetail() <= 0) + if (isAgentAvatarValid() && getLightingDetail() <= 0) { - if (avatarp->mSpecialRenderMode == 0) // normal + if (gAgentAvatarp->mSpecialRenderMode == 0) // normal { gPipeline.enableLightsAvatar(); } - else if (avatarp->mSpecialRenderMode >= 1) // anim preview + else if (gAgentAvatarp->mSpecialRenderMode >= 1) // anim preview { gPipeline.enableLightsAvatarEdit(LLColor4(0.7f, 0.6f, 0.3f, 1.f)); } @@ -7101,15 +7098,15 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) { if (LLPipeline::sWaterReflections && assertInitialized() && LLDrawPoolWater::sNeedsReflectionUpdate) { - LLVOAvatarSelf* avatarp = gAgent.getAvatarObject(); + BOOL skip_avatar_update = FALSE; if (gAgentCamera.getCameraAnimating() || gAgentCamera.getCameraMode() != CAMERA_MODE_MOUSELOOK) { - avatarp = NULL; + skip_avatar_update = TRUE; } - if (avatarp) + if (!skip_avatar_update) { - avatarp->updateAttachmentVisibility(CAMERA_MODE_THIRD_PERSON); + gAgentAvatarp->updateAttachmentVisibility(CAMERA_MODE_THIRD_PERSON); } LLVertexBuffer::unbind(); @@ -7333,9 +7330,9 @@ void LLPipeline::generateWaterReflection(LLCamera& camera_in) LLGLState::checkTextureChannels(); LLGLState::checkClientArrays(); - if (avatarp) + if (!skip_avatar_update) { - avatarp->updateAttachmentVisibility(gAgentCamera.getCameraMode()); + gAgentAvatarp->updateAttachmentVisibility(gAgentCamera.getCameraMode()); } } } diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml index a3e5361e76..fed326c25e 100644 --- a/indra/newview/skins/default/textures/textures.xml +++ b/indra/newview/skins/default/textures/textures.xml @@ -616,12 +616,15 @@ with the same filename but different name <texture name="Toolbar_Divider" file_name="containers/Toolbar_Divider.png" preload="false" /> <texture name="Toolbar_Left_Off" file_name="containers/Toolbar_Left_Off.png" preload="false" scale.left="5" scale.bottom="4" scale.top="24" scale.right="30" /> + <texture name="Toolbar_Left_Over" file_name="containers/Toolbar_Left_Over.png" preload="false" scale.left="5" scale.bottom="4" scale.top="24" scale.right="30" /> <texture name="Toolbar_Left_Press" file_name="containers/Toolbar_Left_Press.png" preload="false" scale.left="5" scale.bottom="4" scale.top="24" scale.right="30" /> <texture name="Toolbar_Left_Selected" file_name="containers/Toolbar_Left_Selected.png" preload="false" scale.left="5" scale.bottom="4" scale.top="24" scale.right="30" /> <texture name="Toolbar_Middle_Off" file_name="containers/Toolbar_Middle_Off.png" preload="false" scale.left="1" scale.bottom="2" scale.top="24" scale.right="30" /> + <texture name="Toolbar_Middle_Over" file_name="containers/Toolbar_Middle_Over.png" preload="false" scale.left="1" scale.bottom="2" scale.top="24" scale.right="30" /> <texture name="Toolbar_Middle_Press" file_name="containers/Toolbar_Middle_Press.png" preload="false" scale.left="1" scale.bottom="2" scale.top="24" scale.right="30" /> <texture name="Toolbar_Middle_Selected" file_name="containers/Toolbar_Middle_Selected.png" preload="false" scale.left="1" scale.bottom="2" scale.top="24" scale.right="30" /> <texture name="Toolbar_Right_Off" file_name="containers/Toolbar_Right_Off.png" preload="false" scale.left="1" scale.bottom="4" scale.top="24" scale.right="26" /> + <texture name="Toolbar_Right_Over" file_name="containers/Toolbar_Right_Over.png" preload="false" scale.left="1" scale.bottom="4" scale.top="24" scale.right="26" /> <texture name="Toolbar_Right_Press" file_name="containers/Toolbar_Right_Press.png" preload="false" scale.left="1" scale.bottom="4" scale.top="24" scale.right="26" /> <texture name="Toolbar_Right_Selected" file_name="containers/Toolbar_Right_Selected.png" preload="false" scale.left="1" scale.bottom="4" scale.top="24" scale.right="26" /> diff --git a/indra/newview/skins/default/xui/da/floater_build_options.xml b/indra/newview/skins/default/xui/da/floater_build_options.xml index 9196f19b78..d3c3ac1899 100644 --- a/indra/newview/skins/default/xui/da/floater_build_options.xml +++ b/indra/newview/skins/default/xui/da/floater_build_options.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="build options floater" title="GITTER VALG"> - <spinner label="Gitter enheder (meter)" label_width="136" name="GridResolution" width="200"/> - <spinner label="Gitter rækkevidde (meter)" label_width="136" name="GridDrawSize" width="200"/> + <spinner label="Enheder (meter)" label_width="136" name="GridResolution" width="200"/> + <spinner label="Rækkevidde (meter)" label_width="136" name="GridDrawSize" width="200"/> <check_box label="Aktivér låsning til underenheder" name="GridSubUnit"/> <check_box label="Vis 'cross-sections'" name="GridCrossSection"/> <text name="grid_opacity_label" tool_tip="Gitter synlighed"> diff --git a/indra/newview/skins/default/xui/da/floater_tools.xml b/indra/newview/skins/default/xui/da/floater_tools.xml index 2e35811133..a39a7e8698 100644 --- a/indra/newview/skins/default/xui/da/floater_tools.xml +++ b/indra/newview/skins/default/xui/da/floater_tools.xml @@ -63,7 +63,7 @@ <radio_item label="Stræk (Ctrl+Shift)" name="radio stretch"/> <radio_item label="Vælg overflade" name="radio select face"/> </radio_group> - <check_box label="Redigér sammenlænkede dele" name="checkbox edit linked parts"/> + <check_box label="Redigér lænkede" name="checkbox edit linked parts"/> <text name="RenderingCost" tool_tip="Hvis beregnede rendering omkostninger for dette objekt"> þ: [COUNT] </text> @@ -184,12 +184,12 @@ Klik for at: </text> <combo_box name="clickaction"> - <combo_box.item label="Rør (Standard)" name="Touch/grab(default)"/> - <combo_box.item label="Sid på objekt" name="Sitonobject"/> - <combo_box.item label="Køb objekt" name="Buyobject"/> - <combo_box.item label="Betal objekt" name="Payobject"/> - <combo_box.item label="Åben" name="Open"/> - <combo_box.item label="Zoom" name="Zoom"/> + <combo_box.item label="Røre (Standard)" name="Touch/grab(default)"/> + <combo_box.item label="Sidde på objekt" name="Sitonobject"/> + <combo_box.item label="Købe objekt" name="Buyobject"/> + <combo_box.item label="Betale objekt" name="Payobject"/> + <combo_box.item label="Åbne" name="Open"/> + <combo_box.item label="Zoome" name="Zoom"/> </combo_box> <check_box label="Til salg:" name="checkbox for sale"/> <combo_box name="sale type"> @@ -206,8 +206,8 @@ <text name="Anyone can:"> Enhver: </text> - <check_box label="Flyt" name="checkbox allow everyone move"/> - <check_box label="Kopi" name="checkbox allow everyone copy"/> + <check_box label="Flytte" name="checkbox allow everyone move"/> + <check_box label="Kopiere" name="checkbox allow everyone copy"/> <text name="Next owner can:"> Næste ejer: </text> @@ -417,21 +417,21 @@ <combo_box.item label="Ingen" name="None"/> <combo_box.item label="Lysintensitet" name="Brightness"/> <combo_box.item label="Mørke" name="Darkness"/> - <combo_box.item label="træårer" name="woodgrain"/> - <combo_box.item label="bark" name="bark"/> - <combo_box.item label="mursten" name="bricks"/> - <combo_box.item label="tern" name="checker"/> - <combo_box.item label="beton" name="concrete"/> - <combo_box.item label="rustik flise" name="crustytile"/> + <combo_box.item label="Træårer" name="woodgrain"/> + <combo_box.item label="Bark" name="bark"/> + <combo_box.item label="Mursten" name="bricks"/> + <combo_box.item label="Tern" name="checker"/> + <combo_box.item label="Beton" name="concrete"/> + <combo_box.item label="Rustik flise" name="crustytile"/> <combo_box.item label="Skåret sten" name="cutstone"/> - <combo_box.item label="plader" name="discs"/> - <combo_box.item label="grus" name="gravel"/> - <combo_box.item label="petriskål" name="petridish"/> - <combo_box.item label="udvendig beklædning" name="siding"/> - <combo_box.item label="stenflise" name="stonetile"/> - <combo_box.item label="puds" name="stucco"/> - <combo_box.item label="rør" name="suction"/> - <combo_box.item label="væv" name="weave"/> + <combo_box.item label="Plader" name="discs"/> + <combo_box.item label="Grus" name="gravel"/> + <combo_box.item label="Petriskål" name="petridish"/> + <combo_box.item label="Udvendig beklædning" name="siding"/> + <combo_box.item label="Stenflise" name="stonetile"/> + <combo_box.item label="Puds" name="stucco"/> + <combo_box.item label="Rør" name="suction"/> + <combo_box.item label="Væv" name="weave"/> </combo_box> <text name="tex scale"> Gentagelser på overflade @@ -440,8 +440,8 @@ <check_box label="Vend" name="checkbox flip s"/> <spinner label="Lodret (V)" name="TexScaleV"/> <check_box label="Vend" name="checkbox flip t"/> - <spinner label="Rotation˚" left="125" name="TexRot" width="55"/> - <spinner label="Gentagelser pr. meter" left="125" name="rptctrl" width="55"/> + <spinner label="Rotation˚"/> + <spinner label="Gentagelser pr. m."/> <button label="Gem" label_selected="Gem" left_delta="62" name="button apply"/> <text name="tex offset"> Tekstur offset @@ -488,7 +488,7 @@ Grå = Offentligt ejet"/> <button label="Opdel" label_selected="Opdel" name="button subdivide land"/> <button label="Saml" label_selected="Saml" name="button join land"/> <text name="label_parcel_trans"> - Transaktioner for land + Transaktioner - land </text> <button label="Køb land" label_selected="Køb land" name="button buy land"/> <button label="Efterlad land" label_selected="Efterlad land" name="button abandon land"/> diff --git a/indra/newview/skins/default/xui/da/menu_mini_map.xml b/indra/newview/skins/default/xui/da/menu_mini_map.xml index 0e2d04ffbb..38486cdecb 100644 --- a/indra/newview/skins/default/xui/da/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/da/menu_mini_map.xml @@ -4,6 +4,6 @@ <menu_item_call label="Zoom mellem" name="Zoom Medium"/> <menu_item_call label="Zoom langt" name="Zoom Far"/> <menu_item_check label="Rotér kort" name="Rotate Map"/> - <menu_item_call label="Stop Tracking" name="Stop Tracking"/> + <menu_item_call label="Fjern ref." name="Stop Tracking"/> <menu_item_call label="Verdenskort" name="World Map"/> </menu> diff --git a/indra/newview/skins/default/xui/da/menu_viewer.xml b/indra/newview/skins/default/xui/da/menu_viewer.xml index 18ad7cfffa..7e7d1b190a 100644 --- a/indra/newview/skins/default/xui/da/menu_viewer.xml +++ b/indra/newview/skins/default/xui/da/menu_viewer.xml @@ -36,7 +36,7 @@ <menu_item_call label="Mit land" name="My Land"/> <menu label="Vis" name="LandShow"> <menu_item_check label="Bevægelses kontrol" name="Movement Controls"/> - <menu_item_check label="Vis kontroller" name="Camera Controls"/> + <menu_item_check label="Kontroller" name="Camera Controls"/> <menu_item_check label="'Ingen adgang' markering" name="Ban Lines"/> <menu_item_check label="Pejlelys" name="beacons"/> <menu_item_check label="Parcel skel" name="Property Lines"/> @@ -75,7 +75,7 @@ <menu_item_call label="Vælg alt" name="Select All"/> <menu_item_call label="Fravælg" name="Deselect"/> </menu> - <menu_item_call label="Sammenkæde" name="Link"/> + <menu_item_call label="Sammenkæd" name="Link"/> <menu_item_call label="Adskil" name="Unlink"/> <menu_item_check label="Redigér sammekædede objekter" name="Edit Linked Parts"/> <menu_item_call label="Fokusér på valgte" name="Focus on Selection"/> @@ -88,10 +88,10 @@ <menu_item_call label="Opdater ændringer i indhold til objekt" name="Save Object Back to Object Contents"/> </menu> <menu label="Scripts" name="Scripts"> - <menu_item_call label="Rekompilér scripts (Mono)" name="Mono"/> + <menu_item_call label="Genoversæt scripts (Mono)" name="Mono"/> <menu_item_call label="Genoversæt scripts (LSL)" name="LSL"/> <menu_item_call label="Genstart scripts" name="Reset Scripts"/> - <menu_item_call label="sæt scripts til "Running"" name="Set Scripts to Running"/> + <menu_item_call label="Sæt scripts til "Running"" name="Set Scripts to Running"/> <menu_item_call label="Sæt scripts til "Not Running"" name="Set Scripts to Not Running"/> </menu> <menu label="Valg" name="Options"> @@ -111,7 +111,7 @@ <menu label="Vis lænkede dele" name="Select Linked Parts"> <menu_item_call label="Vælg næste del" name="Select Next Part"/> <menu_item_call label="Vælg forrige del" name="Select Previous Part"/> - <menu_item_call label="Inkludér næste valg" name="Include Next Part"/> + <menu_item_call label="Inkludér næste del" name="Include Next Part"/> <menu_item_call label="Inkludér forrige del" name="Include Previous Part"/> </menu> </menu> @@ -128,7 +128,7 @@ <menu_item_check label="Begræns valg afstand" name="Limit Select Distance"/> <menu_item_check label="Fjern kamerabegrænsninger" name="Disable Camera Distance"/> <menu_item_check label="Højopløsningsfoto" name="HighResSnapshot"/> - <menu_item_check label="Lydløse foto's til disk" name="QuietSnapshotsToDisk"/> + <menu_item_check label="Lydløse fotos til disk" name="QuietSnapshotsToDisk"/> <menu_item_check label="Komprimér fotos til disk" name="CompressSnapshotsToDisk"/> <menu label="Værktøjer til ydelse" name="Performance Tools"> <menu_item_call label="Lag meter" name="Lag Meter"/> @@ -149,7 +149,7 @@ <menu_item_check label="Alpha" name="Alpha"/> <menu_item_check label="Træer" name="Tree"/> <menu_item_check label="Avatarer" name="Character"/> - <menu_item_check label="SurfacePath" name="SurfacePath"/> + <menu_item_check label="Overflade" name="SurfacePath"/> <menu_item_check label="Himmel" name="Sky"/> <menu_item_check label="Vand" name="Water"/> <menu_item_check label="Jord" name="Ground"/> @@ -168,7 +168,7 @@ <menu_item_check label="Tåge" name="Fog"/> <menu_item_check label="Fleksible objekter" name="Flexible Objects"/> </menu> - <menu_item_check label="Kør flere tråde" name="Run Multiple Threads"/> + <menu_item_check label="Kør flere 'threats'" name="Run Multiple Threads"/> <menu_item_call label="Tøm gruppe cache" name="ClearGroupCache"/> <menu_item_check label="Muse udjævning" name="Mouse Smoothing"/> <menu label="Shortcuts" name="Shortcuts"> diff --git a/indra/newview/skins/default/xui/da/notifications.xml b/indra/newview/skins/default/xui/da/notifications.xml index ea3527d63b..30e19ee901 100644 --- a/indra/newview/skins/default/xui/da/notifications.xml +++ b/indra/newview/skins/default/xui/da/notifications.xml @@ -228,7 +228,7 @@ Er du sikker på at du vil fortsætte? Cache vil blive tømt ved næste genstart af [APP_NAME]. </notification> <notification name="CacheWillBeMoved"> - Cache vil blive flyttet ved næste genstart af [APP_NAME]. + Cache vil blive fjernet ved næste genstart af [APP_NAME]. Note: This will clear the cache. </notification> <notification name="ChangeConnectionPort"> diff --git a/indra/newview/skins/default/xui/da/panel_landmarks.xml b/indra/newview/skins/default/xui/da/panel_landmarks.xml index 8adce2c819..9a0a2fb207 100644 --- a/indra/newview/skins/default/xui/da/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/da/panel_landmarks.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="Landmarks"> <accordion name="landmarks_accordion"> - <accordion_tab name="tab_favorites" title="Favorites bjælke"/> + <accordion_tab name="tab_favorites" title="Favoritter"/> <accordion_tab name="tab_landmarks" title="Mine landmærker"/> <accordion_tab name="tab_inventory" title="Min beholdning"/> <accordion_tab name="tab_library" title="Bibliotek"/> diff --git a/indra/newview/skins/default/xui/da/panel_navigation_bar.xml b/indra/newview/skins/default/xui/da/panel_navigation_bar.xml index 79f7e81b35..2ee87433a4 100644 --- a/indra/newview/skins/default/xui/da/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/da/panel_navigation_bar.xml @@ -11,7 +11,7 @@ </panel> <favorites_bar name="favorite" tool_tip="Træk landemærker hertil for at få hurtig adgang til dine favoritsteder i Second Life!"> <label name="favorites_bar_label" tool_tip="Træk landemærker hertil for at få hurtig adgang til dine favoritsteder i Second Life!"> - Favorit bar + Favoritter </label> <chevron_button name=">>" tool_tip="Søg mere af mine favoritter"/> </favorites_bar> diff --git a/indra/newview/skins/default/xui/da/panel_nearby_media.xml b/indra/newview/skins/default/xui/da/panel_nearby_media.xml index 407d9f7c87..7a8b5a6389 100644 --- a/indra/newview/skins/default/xui/da/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/da/panel_nearby_media.xml @@ -41,25 +41,25 @@ <panel name="media_controls_panel"> <layout_stack name="media_controls"> <layout_panel name="stop"> - <button name="stop_btn" tool_tip="Stop valgte media"/> + <button name="stop_btn" tool_tip="Stop valgte medie"/> </layout_panel> <layout_panel name="play"> - <button name="play_btn" tool_tip="Afspil valgte media"/> + <button name="play_btn" tool_tip="Afspil valgte medie"/> </layout_panel> <layout_panel name="pause"> - <button name="pause_btn" tool_tip="Pause valgte media"/> + <button name="pause_btn" tool_tip="Pause valgte medie"/> </layout_panel> <layout_panel name="volume_slider_ctrl"> - <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Lydstyrke for valgte media"/> + <slider_bar initial_value="0.5" name="volume_slider" tool_tip="Volumen for valgte medie"/> </layout_panel> <layout_panel name="mute"> - <button name="mute_btn" tool_tip="Sluk for lyd på valgte media"/> + <button name="mute_btn" tool_tip="Sluk for lyd for valgte medie"/> </layout_panel> <layout_panel name="zoom"> - <button name="zoom_btn" tool_tip="Zoom ind til valgte media"/> + <button name="zoom_btn" tool_tip="Zoom ind til valgte medie"/> </layout_panel> <layout_panel name="unzoom"> - <button name="unzoom_btn" tool_tip="Zoom tilbage fra valgte media"/> + <button name="unzoom_btn" tool_tip="Zoom tilbage fra valgte medie"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml index b6ff4a6d90..1570960745 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_advanced.xml @@ -18,7 +18,7 @@ <check_box label="Tast-tast-hold for at løbe" name="tap_tap_hold_to_run"/> <check_box label="Bevæg avatarlæber når der tales" name="enable_lip_sync"/> <check_box label="Talebobler" name="bubble_text_chat"/> - <slider label="Gennemsigtighed" name="bubble_chat_opacity"/> + <slider label="Synlighed" name="bubble_chat_opacity"/> <color_swatch name="background" tool_tip="Vælg farve for talebobler"/> <check_box label="Vis script fejl i:" name="show_script_errors"/> <radio_group name="show_location"> diff --git a/indra/newview/skins/default/xui/da/panel_preferences_general.xml b/indra/newview/skins/default/xui/da/panel_preferences_general.xml index f2c59f3d81..e70cb48262 100644 --- a/indra/newview/skins/default/xui/da/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/da/panel_preferences_general.xml @@ -23,7 +23,7 @@ <text name="maturity_desired_textbox"/> <combo_box name="maturity_desired_combobox"> <combo_box.item label="PG, Mature og Adult" name="Desired_Adult"/> - <combo_box.item label="PG and Mature" name="Desired_Mature"/> + <combo_box.item label="PG og Mature" name="Desired_Mature"/> <combo_box.item label="PG" name="Desired_PG"/> </combo_box> <text name="start_location_textbox"> diff --git a/indra/newview/skins/default/xui/da/panel_region_covenant.xml b/indra/newview/skins/default/xui/da/panel_region_covenant.xml index 564d8e6665..4b9c7539ea 100644 --- a/indra/newview/skins/default/xui/da/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/da/panel_region_covenant.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Covenant" name="Covenant"> +<panel label="Regler" name="Covenant"> <text name="estate_section_lbl"> Estate </text> diff --git a/indra/newview/skins/default/xui/da/panel_region_estate.xml b/indra/newview/skins/default/xui/da/panel_region_estate.xml index 7941553ade..65948ce481 100644 --- a/indra/newview/skins/default/xui/da/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/da/panel_region_estate.xml @@ -39,7 +39,7 @@ </string> <button label="?" name="abuse_email_address_help"/> <button label="Gem" name="apply_btn"/> - <button label="Spark en beboer ud af estate..." name="kick_user_from_estate_btn"/> + <button label="Fjern en beboer fra estate..." name="kick_user_from_estate_btn"/> <button label="Send besked til estate..." name="message_estate_btn"/> <text name="estate_manager_label"> Administratorer: diff --git a/indra/newview/skins/default/xui/da/panel_side_tray.xml b/indra/newview/skins/default/xui/da/panel_side_tray.xml index ec430d6fd4..66c3e69904 100644 --- a/indra/newview/skins/default/xui/da/panel_side_tray.xml +++ b/indra/newview/skins/default/xui/da/panel_side_tray.xml @@ -3,27 +3,27 @@ partially on screen to hold tab buttons. --> <side_tray name="sidebar"> <sidetray_tab description="Åbn/luk sidebar" name="sidebar_openclose" tab_title="Åbn/luk sidebar"/> - <sidetray_tab description="Hjem." name="sidebar_home" tab_title="Home"> + <sidetray_tab description="Hjem." name="sidebar_home" tab_title="Hjem"> <panel label="hjem" name="panel_home"/> </sidetray_tab> - <sidetray_tab description="Redigér din profile og favoritter." name="sidebar_me" tab_title="My Profile"> + <sidetray_tab description="Redigér din profile og favoritter." name="sidebar_me" tab_title="Min profil"> <panel_container name="panel_container"> <panel label="Mig" name="panel_me"/> </panel_container> </sidetray_tab> - <sidetray_tab description="Find venner, kontakter og personer tæt på." name="sidebar_people" tab_title="People"> + <sidetray_tab description="Find venner, kontakter og personer tæt på." name="sidebar_people" tab_title="Personer"> <panel_container name="panel_container"> <panel label="Gruppe profil" name="panel_group_info_sidetray"/> <panel label="Blokerede beboere og objekter" name="panel_block_list_sidetray"/> </panel_container> </sidetray_tab> - <sidetray_tab description="Find steder du vil hen og steder du har været før." label="Steder" name="sidebar_places" tab_title="Places"> + <sidetray_tab description="Find steder du vil hen og steder du har været før." label="Steder" name="sidebar_places" tab_title="Steder"> <panel label="Steder" name="panel_places"/> </sidetray_tab> - <sidetray_tab description="Browse din beholdning." name="sidebar_inventory" tab_title="My Inventory"> + <sidetray_tab description="Browse din beholdning." name="sidebar_inventory" tab_title="Min beholdning"> <panel label="Redigér beholdning" name="sidepanel_inventory"/> </sidetray_tab> - <sidetray_tab description="Ændre dit nuværende udseende" name="sidebar_appearance" tab_title="My Appearance"> - <panel label="Redigér fremtoning" name="sidepanel_appearance"/> + <sidetray_tab description="Ændre dit nuværende udseende" name="sidebar_appearance" tab_title="Mit udseende"> + <panel label="Redigér udseende" name="sidepanel_appearance"/> </sidetray_tab> </side_tray> diff --git a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml index 77db828c20..701a59bade 100644 --- a/indra/newview/skins/default/xui/da/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_item_info.xml @@ -42,27 +42,27 @@ <text name="perm_modify"> Du kan: </text> - <check_box label="Redigér" name="CheckOwnerModify"/> - <check_box label="Kopi" name="CheckOwnerCopy"/> - <check_box label="Giv væk" name="CheckOwnerTransfer"/> + <check_box label="Redigere" name="CheckOwnerModify"/> + <check_box label="Kopiere" name="CheckOwnerCopy"/> + <check_box label="Give væk" name="CheckOwnerTransfer"/> <text name="AnyoneLabel"> Enhver: </text> - <check_box label="Kopi" name="CheckEveryoneCopy"/> + <check_box label="Kopiere" name="CheckEveryoneCopy"/> <text name="GroupLabel"> Gruppe: </text> - <check_box label="Del" name="CheckShareWithGroup" tool_tip="Tillad alle medlemmer i den aktive gruppe at dele dine 'redigere' rettigheder for dette objekt. Du skal dedikere for at åbne for rolle begrænsninger."/> + <check_box label="Dele" name="CheckShareWithGroup" tool_tip="Tillad alle medlemmer i den aktive gruppe at dele dine 'redigere' rettigheder for dette objekt. Du skal dedikere for at åbne for rolle begrænsninger."/> <text name="NextOwnerLabel"> Næste ejer: </text> <check_box label="Redigere" name="CheckNextOwnerModify"/> - <check_box label="Kopi" name="CheckNextOwnerCopy"/> - <check_box label="Giv væk" name="CheckNextOwnerTransfer" tool_tip="Næste ejer kan give væk eller sælge dette objekt"/> + <check_box label="Kopiere" name="CheckNextOwnerCopy"/> + <check_box label="Give væk" name="CheckNextOwnerTransfer" tool_tip="Næste ejer kan give væk eller sælge dette objekt"/> </panel> <check_box label="Til salg" name="CheckPurchase"/> <combo_box name="combobox sale copy"> - <combo_box.item label="Kopiér" name="Copy"/> + <combo_box.item label="Kopi" name="Copy"/> <combo_box.item label="Original" name="Original"/> </combo_box> <spinner label="Pris: L$" name="Edit Cost"/> diff --git a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml index 4642c11d21..bec97734e4 100644 --- a/indra/newview/skins/default/xui/da/sidepanel_task_info.xml +++ b/indra/newview/skins/default/xui/da/sidepanel_task_info.xml @@ -67,11 +67,11 @@ Klik for at: </text> <combo_box name="clickaction"> - <combo_box.item label="Berør (standard)" name="Touch/grab(default)"/> - <combo_box.item label="Sid på objekt" name="Sitonobject"/> - <combo_box.item label="Køb objekt" name="Buyobject"/> - <combo_box.item label="Betal objekt" name="Payobject"/> - <combo_box.item label="Åben" name="Open"/> + <combo_box.item label="Berøre (standard)" name="Touch/grab(default)"/> + <combo_box.item label="Sidde på objekt" name="Sitonobject"/> + <combo_box.item label="Købe objekt" name="Buyobject"/> + <combo_box.item label="Betale objekt" name="Payobject"/> + <combo_box.item label="Åbne" name="Open"/> </combo_box> <panel name="perms_inv"> <text name="perm_modify"> @@ -80,18 +80,18 @@ <text name="Anyone can:"> Enhver: </text> - <check_box label="Kopi" name="checkbox allow everyone copy"/> - <check_box label="Flyt" name="checkbox allow everyone move"/> + <check_box label="Kopiere" name="checkbox allow everyone copy"/> + <check_box label="Flytte" name="checkbox allow everyone move"/> <text name="GroupLabel"> Gruppe: </text> - <check_box label="Del" name="checkbox share with group" tool_tip="Tillad alle gruppemedlemmer i den valgte gruppe at dele dine redigeringsrettigheder for dette objekt. Du skal dedikere for at aktivere rollebegrænsninger"/> + <check_box label="Dele" name="checkbox share with group" tool_tip="Tillad alle gruppemedlemmer i den valgte gruppe at dele dine redigeringsrettigheder for dette objekt. Du skal dedikere for at aktivere rollebegrænsninger"/> <text name="NextOwnerLabel"> Næste ejer: </text> <check_box label="Redigere" name="checkbox next owner can modify"/> - <check_box label="Kopi" name="checkbox next owner can copy"/> - <check_box label="Overfør" name="checkbox next owner can transfer" tool_tip="Næste ejer kan give væk eller sælge dette objekt"/> + <check_box label="Kopiere" name="checkbox next owner can copy"/> + <check_box label="Overføre" name="checkbox next owner can transfer" tool_tip="Næste ejer kan give væk eller sælge dette objekt"/> </panel> <check_box label="Til salg" name="checkbox for sale"/> <combo_box name="sale type"> diff --git a/indra/newview/skins/default/xui/da/strings.xml b/indra/newview/skins/default/xui/da/strings.xml index bce197113f..37501a3534 100644 --- a/indra/newview/skins/default/xui/da/strings.xml +++ b/indra/newview/skins/default/xui/da/strings.xml @@ -56,7 +56,7 @@ Klargør multimedia... </string> <string name="LoginInitializingFonts"> - Indlæser fonts... + Indlæser skriftstyper... </string> <string name="LoginVerifyingCache"> Checker cache filer (kan tage 60-90 sekunder)... @@ -892,8 +892,8 @@ <string name="no_modify" value=" (ikke redigere)"/> <string name="no_copy" value=" (ikke kopiere)"/> <string name="worn" value=" (båret)"/> - <string name="link" value=" (sammenkæde)"/> - <string name="broken_link" value=" (brudt_kæde)"/> + <string name="link" value=" (link)"/> + <string name="broken_link" value=" (brudt link)"/> <string name="LoadingContents"> Henter indhold... </string> @@ -1795,7 +1795,7 @@ Forventet .wav, .tga, .bmp, .jpg, .jpeg, or .bvh Enhver </string> <string name="You"> - Dig + Du </string> <string name="Multiple Media"> Flere medietyper @@ -2604,7 +2604,7 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. Mere </string> <string name="More Gravity"> - More + Mere </string> <string name="More Lipstick"> Mere læbestift @@ -3276,10 +3276,10 @@ Hvis du bliver ved med at modtage denne besked, kontakt venligst [SUPPORT_SITE]. (Moderator) </string> <string name="started_call"> - Startet et stemme opkald + startede et stemme opkald </string> <string name="joined_call"> - Tilsluttet stemme opkaldet + tilsluttede stemme opkald </string> <string name="ringing-im"> Tilslutter stemme opkald... diff --git a/indra/newview/skins/default/xui/de/floater_build_options.xml b/indra/newview/skins/default/xui/de/floater_build_options.xml index b70c859490..e90eb2c00b 100644 --- a/indra/newview/skins/default/xui/de/floater_build_options.xml +++ b/indra/newview/skins/default/xui/de/floater_build_options.xml @@ -2,7 +2,7 @@ <floater name="build options floater" title="RASTER-OPTIONEN"> <spinner label="Raster-Einheiten (Meter)" name="GridResolution"/> <spinner label="Rastergröße (Meter)" name="GridDrawSize"/> - <check_box label="Einrasten von Untereinheiten aktivieren" name="GridSubUnit"/> + <check_box label="An Untereinheiten ausrichten" name="GridSubUnit"/> <check_box label="Überschneidungen anzeigen" name="GridCrossSection"/> <text name="grid_opacity_label" tool_tip="Raster-Deckkraft"> Deckkraft: diff --git a/indra/newview/skins/default/xui/de/panel_nearby_media.xml b/indra/newview/skins/default/xui/de/panel_nearby_media.xml index ad26f71245..32750f14d4 100644 --- a/indra/newview/skins/default/xui/de/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/de/panel_nearby_media.xml @@ -13,8 +13,8 @@ (wird abgespielt) </string> <panel name="minimized_controls"> - <button label="Alle stoppen" name="all_nearby_media_disable_btn" tool_tip="Alle Medien in der Nähe ausschalten"/> - <button label="Alle starten" name="all_nearby_media_enable_btn" tool_tip="Alle Medien in der Nähe einschalten"/> + <button label="Stoppen" name="all_nearby_media_disable_btn" tool_tip="Alle Medien in der Nähe ausschalten"/> + <button label="Starten" name="all_nearby_media_enable_btn" tool_tip="Alle Medien in der Nähe einschalten"/> <button name="open_prefs_btn" tool_tip="Medien-Einstellungen öffnen"/> <button label="Mehr >>" label_selected="Weniger <<" name="more_less_btn" tool_tip="Erweiterte Steuerung"/> </panel> diff --git a/indra/newview/skins/default/xui/en/floater_sell_land.xml b/indra/newview/skins/default/xui/en/floater_sell_land.xml index afc44c41b8..4cae42bcfe 100644 --- a/indra/newview/skins/default/xui/en/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/en/floater_sell_land.xml @@ -203,13 +203,13 @@ name="none" visible="false" /> <radio_item - bottom="20" + top_pad="10" height="16" label="No, keep ownership of objects" left="10" name="no" /> <radio_item - bottom="40" + top_pad="10" height="16" label="Yes, sell objects with land" left="10" diff --git a/indra/newview/skins/default/xui/en/panel_group_general.xml b/indra/newview/skins/default/xui/en/panel_group_general.xml index f913c58cc9..9341d433e8 100644 --- a/indra/newview/skins/default/xui/en/panel_group_general.xml +++ b/indra/newview/skins/default/xui/en/panel_group_general.xml @@ -241,14 +241,17 @@ Hover your mouse over the options for more help. tool_tip="Sets whether your group contains information rated as Moderate" top_pad="4" width="190"> + <combo_item name="select_mature" value="Select"> + - Select Mature - + </combo_item> <combo_box.item - label="General Content" - name="pg" - value="Not Mature" /> - <combo_box.item label="Moderate Content" name="mature" value="Mature" /> + <combo_box.item + label="General Content" + name="pg" + value="Not Mature" /> </combo_box> <check_box follows="left|top" diff --git a/indra/newview/skins/default/xui/en/panel_landmarks.xml b/indra/newview/skins/default/xui/en/panel_landmarks.xml index ee8bca6f83..639e5d30ef 100644 --- a/indra/newview/skins/default/xui/en/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/en/panel_landmarks.xml @@ -3,22 +3,25 @@ name="Landmarks" top="0" height="400" - layout="topleft" + layout="topleft" left="0" - width="380" + width="313" help_topic="panel_landmarks" border="false" background_visible="true" - bg_alpha_color="DkGray2" + bg_alpha_color="DkGray" follows="all"> <accordion + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" follows="all" - height="360" + height="369" layout="topleft" - left="0" + left="3" name="landmarks_accordion" top="0" - width="380"> + width="307"> <accordion_tab layout="topleft" name="tab_favorites" @@ -33,7 +36,7 @@ mouse_opaque="true" name="favorites_list" start_folder="Favorites" - width="380"/> + width="307"/> </accordion_tab> <accordion_tab layout="topleft" @@ -49,7 +52,7 @@ mouse_opaque="true" name="landmarks_list" start_folder="Landmarks" - width="380"/> + width="307"/> </accordion_tab> <accordion_tab layout="topleft" @@ -65,7 +68,7 @@ mouse_opaque="true" name="my_inventory_list" start_folder="My Inventory" - width="380"/> + width="307"/> </accordion_tab> <accordion_tab layout="topleft" @@ -81,55 +84,64 @@ mouse_opaque="true" name="library_list" start_folder="LIBRARY" - width="380"/> + width="313"/> </accordion_tab> </accordion> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + background_visible="true" bevel_style="none" bottom="0" follows="left|right|bottom" - height="38" + height="27" layout="bottomleft" - left="0" + left="3" name="bottom_panel" - width="380"> + width="313"> <button follows="bottom|left" tool_tip="Show additional options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="10" + left="0" name="options_gear_btn" - top="14" - width="18" /> + top="1" + width="31" /> <button follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="add_btn" tool_tip="Add new landmark" - width="18" /> + width="31" /> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="209" + /> <dnd_button - follows="bottom|right" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" layout="topleft" - right="-8" + left_pad="1" name="trash_btn" tool_tip="Remove selected landmark" - top="14" - width="18" /> + width="31" /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_main_inventory.xml b/indra/newview/skins/default/xui/en/panel_main_inventory.xml index c7768c6eb6..bef62f48e0 100644 --- a/indra/newview/skins/default/xui/en/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_main_inventory.xml @@ -417,15 +417,15 @@ background_opaque="true" follows="all" halign="center" - height="300" + height="306" layout="topleft" - left="6" + left="7" name="inventory filter tabs" tab_height="30" tab_position="top" tab_min_width="100" top_pad="10" - width="315"> + width="312"> <inventory_panel bg_opaque_color="DkGray2" bg_alpha_color="DkGray2" @@ -442,7 +442,7 @@ name="All Items" sort_order_setting="InventorySortOrder" top="16" - width="290" /> + width="288" /> <inventory_panel bg_opaque_color="DkGray2" bg_alpha_color="DkGray2" @@ -451,7 +451,7 @@ border="false" bevel_style="none" follows="all" - height="295" + height="293" label="RECENT" help_topic="recent_inventory_tab" layout="topleft" @@ -461,52 +461,61 @@ </tab_container> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" background_visible="true" - background_opaque="true" bevel_style="none" follows="left|right|bottom" - height="38" + height="27" layout="topleft" - top_pad="-1" - left="9" + top_pad="4" + left="10" name="bottom_panel" width="310"> <button follows="bottom|left" tool_tip="Show additional options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="8" + left="0" name="options_gear_btn" - top="14" - width="18" /> + top="1" + width="31" /> <button follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="add_btn" tool_tip="Add new item" - width="18" /> + width="31" /> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="209" + /> <dnd_button - follows="bottom|right" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" + left_pad="1" layout="topleft" - right="-7" name="trash_btn" tool_tip="Remove selected item" - top="14" - width="18" /> + width="31"/> </panel> diff --git a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml index cc60b97f92..66ef373168 100644 --- a/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml +++ b/indra/newview/skins/default/xui/en/panel_outfits_inventory.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> <panel name="Outfits" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" + background_opaque="true" background_visible="true" follows="all" height="570" @@ -11,15 +14,15 @@ border="false"> <tab_container follows="all" - height="490" + height="497" layout="topleft" - left="6" + left="7" name="appearance_tabs" tab_min_width="140" tab_height="30" tab_position="top" halign="center" - width="315"> + width="312"> <inventory_panel background_visible="true" background_opaque="true" @@ -30,7 +33,7 @@ border="false" left="0" top="0" - width="314" + width="315" mouse_opaque="true" name="outfitslist_tab" start_folder="My Outfits" /> @@ -47,53 +50,53 @@ mouse_opaque="true" name="cof_tab" start_folder="Current Outfit" - width="313" /> + width="315" /> </tab_container> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" background_visible="true" - background_opaque="true" - follows="left|right|bottom" - height="38" - layout="topleft" - left="9" - visible="true" - top_pad="-1" - width="310" /> - <panel - background_visible="false" follows="bottom|left" height="73" layout="topleft" left="9" + top_pad="3" visible="true" name="bottom_panel" - top_pad="-38" width="310"> <button follows="bottom|left" tool_tip="Show additional options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="8" + left="1" name="options_gear_btn" - top="14" - width="18" /> + top="1" + width="31" /> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="241" + /> + <dnd_button - follows="bottom|right" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" + follows="bottom|left" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" layout="topleft" - right="-9" + left_pad="1" name="trash_btn" tool_tip="Remove selected item" - top="14" - width="18" /> + width="31"/> <button follows="bottom|left" height="23" @@ -101,7 +104,7 @@ layout="topleft" name="make_outfit_btn" tool_tip="Save appearance as an outfit" - top="43" + top_pad="6" left="0" width="153" /> <button @@ -111,7 +114,6 @@ layout="topleft" name="wear_btn" left_pad="3" - top="43" tool_tip="Wear selected outfit" width="152" /> <button @@ -126,4 +128,4 @@ width="20" /> </panel> -</panel> +</panel>
\ No newline at end of file diff --git a/indra/newview/skins/default/xui/en/panel_people.xml b/indra/newview/skins/default/xui/en/panel_people.xml index 13791a6d32..85841da48f 100644 --- a/indra/newview/skins/default/xui/en/panel_people.xml +++ b/indra/newview/skins/default/xui/en/panel_people.xml @@ -2,13 +2,13 @@ <!-- Side tray panel --> <panel follows="all" + height="449" label="People" layout="topleft" - height="449" + left="0" min_height="350" name="people_panel" top="0" - left="0" width="333"> <string name="no_people" @@ -39,7 +39,6 @@ name="no_groups_msg" value="[secondlife:///app/search/groups Try searching for some groups to join.]" /> <filter_editor - text_pad_left="10" follows="left|top|right" height="23" layout="topleft" @@ -48,6 +47,7 @@ max_length="300" name="filter_input" text_color="Black" + text_pad_left="10" top="3" width="303" /> <tab_container @@ -63,10 +63,10 @@ halign="center" width="317"> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" follows="all" height="383" label="NEARBY" @@ -78,56 +78,70 @@ width="313"> <avatar_list allow_select="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" follows="all" - height="345" + height="352" ignore_online_status="true" layout="topleft" - left="0" + left="3" multi_select="true" name="avatar_list" top="0" - width="313" /> + width="307" /> <panel + background_visible="true" follows="left|right|bottom" - height="38" + height="27" label="bottom_panel" layout="topleft" - left="0" + left="3" name="bottom_panel" width="313"> <button follows="bottom|left" - tool_tip="Options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="10" + left="0" name="nearby_view_sort_btn" - top="10" - width="18" /> + tool_tip="Options" + top="1" + width="31" /> <button follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="add_friend_btn" tool_tip="Add selected Resident to your friends List" - width="18"> + width="31"> <commit_callback function="People.addFriend" /> </button> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="241" + /> </panel> </panel> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" follows="all" height="383" label="MY FRIENDS" @@ -138,13 +152,16 @@ top="0" width="313"> <accordion + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" follows="all" - height="345" + height="352" layout="topleft" - left="0" + left="3" name="friends_accordion" top="0" - width="313"> + width="307"> <accordion_tab layout="topleft" height="172" @@ -160,7 +177,7 @@ multi_select="true" name="avatars_online" top="0" - width="313" /> + width="307" /> </accordion_tab> <accordion_tab layout="topleft" @@ -176,53 +193,64 @@ multi_select="true" name="avatars_all" top="0" - width="313" /> + width="307" /> </accordion_tab> </accordion> <panel + background_visible="true" follows="left|right|bottom" - height="38" + height="27" label="bottom_panel" layout="topleft" - left="0" + left="3" name="bottom_panel" width="313"> <button follows="bottom|left" tool_tip="Options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="10" + left="0" name="friends_viewsort_btn" - top="10" - width="18" /> + top="1" + width="31" /> <button follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="add_btn" tool_tip="Offer friendship to a Resident" - width="18" /> + width="31" /> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Middle_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="210" + /> <button follows="bottom|left" - height="18" - image_selected="TrashItem_Press" - image_unselected="TrashItem_Off" - image_disabled="TrashItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Right_Over" + image_overlay="TrashItem_Off" + image_selected="Toolbar_Right_Selected" + image_unselected="Toolbar_Right_Off" layout="topleft" - left_pad="10" - right="-10" + left_pad="1" name="del_btn" tool_tip="Remove selected person from your Friends list" - top_delta="0" - width="18" /> + width="31" /> </panel> <text follows="all" @@ -237,10 +265,10 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t </text> </panel> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" follows="all" height="383" label="MY GROUPS" @@ -255,18 +283,22 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t Values are set from appropriate strings at the top of file via LLPeoplePanel::postBuild() --> <group_list + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" follows="all" - height="345" + height="352" layout="topleft" - left="0" + left="3" name="group_list" no_filtered_groups_msg="[secondlife:///app/search/groups Try finding the group in search?]" no_groups_msg="[secondlife:///app/search/groups Try searching for some groups to join.]" top="0" - width="313" /> + width="307" /> <panel + background_visible="true" follows="left|right|bottom" - height="38" + height="27" label="bottom_panel" layout="topleft" left="0" @@ -275,45 +307,56 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t <button follows="bottom|left" tool_tip="Options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="10" + left="3" name="groups_viewsort_btn" - top="10" - width="18" /> + top="1" + width="31" /> <button follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="plus_btn" tool_tip="Join group/Create new group" - width="18" /> + width="31" /> <button follows="bottom|left" - height="10" - image_hover_selected="Activate_Checkmark" - image_selected="Activate_Checkmark" - image_unselected="Activate_Checkmark" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="Activate_Checkmark" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="activate_btn" tool_tip="Activate selected group" - top_delta="4" - width="10" /> + width="31" /> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="209" + /> </panel> </panel> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + background_opaque="true" + background_visible="true" + bg_alpha_color="DkGray" + bg_opaque_color="DkGray" follows="all" height="383" label="RECENT" @@ -325,18 +368,22 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t width="313"> <avatar_list allow_select="true" + background_visible="true" + bg_alpha_color="DkGray2" + bg_opaque_color="DkGray2" follows="all" - height="345" + height="352" layout="topleft" - left="0" + left="3" multi_select="true" name="avatar_list" show_last_interaction_time="true" top="0" - width="313" /> + width="307" /> <panel + background_visible="true" follows="left|right|bottom" - height="38" + height="27" label="bottom_panel" layout="topleft" left="0" @@ -345,30 +392,40 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t <button follows="bottom|left" tool_tip="Options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="10" + left="3" name="recent_viewsort_btn" - top="10" - width="18" /> + top="1" + width="31" /> <button follows="bottom|left" - height="18" - image_selected="AddItem_Press" - image_unselected="AddItem_Off" - image_disabled="AddItem_Disabled" + height="25" + image_hover_unselected="Toolbar_Middle_Over" + image_overlay="AddItem_Off" + image_selected="Toolbar_Middle_Selected" + image_unselected="Toolbar_Middle_Off" layout="topleft" - left_pad="10" + left_pad="1" name="add_friend_btn" - top_delta="0" tool_tip="Add selected Resident to your friends List" - width="18"> + width="31"> <commit_callback function="People.addFriend" /> </button> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="241" + /> </panel> </panel> </tab_container> @@ -377,7 +434,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t height="23" layout="topleft" left="8" - top_pad="0" + top_pad="4" name="button_bar" width="313"> <button @@ -387,6 +444,7 @@ If you're looking for people to hang out with, [secondlife:///app/worldmap try t layout="topleft" name="view_profile_btn" tool_tip="Show picture, groups, and other Residents information" + top="0" width="70" /> <button follows="bottom|left" diff --git a/indra/newview/skins/default/xui/en/panel_places.xml b/indra/newview/skins/default/xui/en/panel_places.xml index ff5d89470c..c61007a9e1 100644 --- a/indra/newview/skins/default/xui/en/panel_places.xml +++ b/indra/newview/skins/default/xui/en/panel_places.xml @@ -65,7 +65,7 @@ background_visible="true" visible="false" width="315" /> <panel - height="19" + height="23" layout="topleft" left="4" name="button_panel" diff --git a/indra/newview/skins/default/xui/en/panel_teleport_history.xml b/indra/newview/skins/default/xui/en/panel_teleport_history.xml index 0d4f67f94c..cbcaf1a58c 100644 --- a/indra/newview/skins/default/xui/en/panel_teleport_history.xml +++ b/indra/newview/skins/default/xui/en/panel_teleport_history.xml @@ -1,17 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes" ?> -<panel name="Teleport History" bottom="0" height="400" left="0" width="380" +<panel name="Teleport History" bottom="0" height="400" left="0" width="313" help_topic="panel_teleport_history" - border="false" follows="left|top|right|bottom"> + border="false" follows="left|top|right|bottom" + background_visible="true" + bg_alpha_color="DkGray"> <accordion follows="left|top|right|bottom" - height="368" + height="369" layout="topleft" - left="0" + left="3" top="0" name="history_accordion" background_visible="true" bg_alpha_color="DkGray2" - width="380"> + width="307"> <accordion_tab layout="topleft" name="today" @@ -23,7 +25,7 @@ left="0" name="today_items" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -37,7 +39,7 @@ left="0" name="yesterday_items" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -51,7 +53,7 @@ left="0" name="2_days_ago" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -65,7 +67,7 @@ left="0" name="3_days_ago" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -79,7 +81,7 @@ left="0" name="4_days_ago" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -93,7 +95,7 @@ left="0" name="5_days_ago_items" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -107,7 +109,7 @@ left="0" name="6_days_and_older_items" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -121,7 +123,7 @@ left="0" name="1_month_and_older_items" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> <accordion_tab @@ -135,34 +137,41 @@ left="0" name="6_months_and_older_items" top="0" - width="380"> + width="307"> </flat_list_view> </accordion_tab> </accordion> <panel - bg_opaque_color="DkGray2" - bg_alpha_color="DkGray2" - background_visible="true" - background_opaque="true" + background_visible="true" bevel_style="none" bottom="0" follows="left|right|bottom" - height="38" + height="27" layout="bottomleft" - left="0" + left="3" name="bottom_panel" - width="380"> + width="313"> <button follows="bottom|left" tool_tip="Show additional options" - height="18" - image_disabled="OptionsMenu_Disabled" - image_selected="OptionsMenu_Press" - image_unselected="OptionsMenu_Off" + height="25" + image_hover_unselected="Toolbar_Left_Over" + image_overlay="OptionsMenu_Off" + image_selected="Toolbar_Left_Selected" + image_unselected="Toolbar_Left_Off" layout="topleft" - left="10" + left="0" name="gear_btn" - top="14" - width="18" /> + top="1" + width="31" /> + <icon + follows="bottom|left" + height="25" + image_name="Toolbar_Right_Off" + layout="topleft" + left_pad="1" + name="dummy_icon" + width="273" + /> </panel> </panel> diff --git a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml index e5382e1e3f..b840fdd31b 100644 --- a/indra/newview/skins/default/xui/en/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/en/sidepanel_item_info.xml @@ -399,12 +399,11 @@ top_pad="10" top_pad="10"/> </panel> <panel - follows="bottom|left" height="30" layout="topleft" name="button_panel" left="5" - bottom="2" + top_pad="0" width="313"> <button height="23" diff --git a/indra/newview/skins/default/xui/es/floater_joystick.xml b/indra/newview/skins/default/xui/es/floater_joystick.xml index 283a46b60b..dbd2e4f04e 100644 --- a/indra/newview/skins/default/xui/es/floater_joystick.xml +++ b/indra/newview/skins/default/xui/es/floater_joystick.xml @@ -63,7 +63,7 @@ <text name="ZoomDeadZone"> Zona muerta zoom </text> - <button font="SansSerifSmall" label="Predeterminados del SpaceNavigator" left="330" name="SpaceNavigatorDefaults" width="210"/> + <button font="SansSerifSmall" label="Por defecto del SpaceNavigator" left="330" name="SpaceNavigatorDefaults" width="210"/> <button label="OK" label_selected="OK" left="330" name="ok_btn"/> <button label="Cancelar" label_selected="Cancelar" left_delta="120" name="cancel_btn"/> <stat_view label="Monitor del joystick" name="axis_view"> diff --git a/indra/newview/skins/default/xui/es/menu_viewer.xml b/indra/newview/skins/default/xui/es/menu_viewer.xml index 2cbd0f0a61..93964a2f4f 100644 --- a/indra/newview/skins/default/xui/es/menu_viewer.xml +++ b/indra/newview/skins/default/xui/es/menu_viewer.xml @@ -238,7 +238,7 @@ <menu_item_check label="Frame Test" name="Frame Test"/> </menu> <menu label="Rendering" name="Rendering"> - <menu_item_check label="Ejes" name="Axes"/> + <menu_item_check label="Axes" name="Axes"/> <menu_item_check label="Wireframe" name="Wireframe"/> <menu_item_check label="Global Illumination" name="Global Illumination"/> <menu_item_check label="Animation Textures" name="Animation Textures"/> @@ -254,7 +254,7 @@ <menu_item_call label="Bumps, Pushes & Hits" name="Bumps, Pushes &amp; Hits"/> <menu label="World" name="World"> <menu_item_check label="Region Sun Override" name="Sim Sun Override"/> - <menu_item_check label="Baliza con destellos" name="Cheesy Beacon"/> + <menu_item_check label="Beacon flashing effect" name="Cheesy Beacon"/> <menu_item_check label="Fixed Weather" name="Fixed Weather"/> <menu_item_call label="Dump Region Object Cache" name="Dump Region Object Cache"/> </menu> @@ -277,10 +277,10 @@ <menu label="Avatar" name="Character"> <menu label="Grab Baked Texture" name="Grab Baked Texture"> <menu_item_call label="Iris" name="Iris"/> - <menu_item_call label="Cabeza" name="Head"/> + <menu_item_call label="Head" name="Head"/> <menu_item_call label="Upper Body" name="Upper Body"/> <menu_item_call label="Lower Body" name="Lower Body"/> - <menu_item_call label="Falda" name="Skirt"/> + <menu_item_call label="Skirt" name="Skirt"/> </menu> <menu label="Character Tests" name="Character Tests"> <menu_item_call label="Toggle Character Geometry" name="Toggle Character Geometry"/> @@ -297,8 +297,8 @@ <menu_item_check label="HTTP Textures" name="HTTP Textures"/> <menu_item_check label="Console Window on next Run" name="Console Window"/> <menu_item_check label="Show Admin Menu" name="View Admin Options"/> - <menu_item_call label="Solicitar estatus de Administrador" name="Request Admin Options"/> - <menu_item_call label="Dejar el estatus de Administrador" name="Leave Admin Options"/> + <menu_item_call label="Request Admin Status" name="Request Admin Options"/> + <menu_item_call label="Leave Admin Status" name="Leave Admin Options"/> </menu> <menu label="Admin" name="Admin"> <menu label="Object"> diff --git a/indra/newview/skins/default/xui/es/notifications.xml b/indra/newview/skins/default/xui/es/notifications.xml index cc6a442508..df18b88832 100644 --- a/indra/newview/skins/default/xui/es/notifications.xml +++ b/indra/newview/skins/default/xui/es/notifications.xml @@ -1734,7 +1734,7 @@ Dado que estos objetos tienen scripts, moverlos a tu inventario puede provocar u <usetemplate ignoretext="Confirmar antes de salir" name="okcancelignore" notext="No salir" yestext="Salir"/> </notification> <notification name="HelpReportAbuseEmailLL"> - Usa esta herramienta para denunciar violaciones de las [http://secondlife.com/corporate/tos.php Condiciones de Servicio] o las [http://secondlife.com/corporate/cs.php Normas de la Comunidad]. + Usa esta herramienta para denunciar violaciones de las [http://secondlife.com/corporate/tos.php Condiciones del Servicio] o las [http://secondlife.com/corporate/cs.php Normas de la Comunidad]. Se investigan y resuelven todas las infracciones denunciadas. </notification> diff --git a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml index 34b78b468b..46d8984889 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_chat.xml @@ -5,7 +5,7 @@ </text> <radio_group name="chat_font_size"> <radio_item label="Disminuir" name="radio" value="0"/> - <radio_item label="Media" name="radio2" value="1"/> + <radio_item label="Medio" name="radio2" value="1"/> <radio_item label="Aumentar" name="radio3" value="2"/> </radio_group> <text name="font_colors"> @@ -46,7 +46,7 @@ <check_box initial_value="true" label="Ejecutar la animación de escribir al hacerlo en el chat" name="play_typing_animation"/> <check_box label="Cuando estoy desconectado, enviarme los MI al correo-e" name="send_im_to_email"/> <text name="show_ims_in_label"> - Mostrar los MI en: + Mostrar los MI en: </text> <text name="requires_restart_label"> (requiere reiniciar) diff --git a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml index 3632ecca7b..bf2c6b7aa6 100644 --- a/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml +++ b/indra/newview/skins/default/xui/es/panel_preferences_privacy.xml @@ -18,7 +18,7 @@ <check_box label="Guardar en mi ordenador registros de los MI" name="log_instant_messages"/> <check_box label="Añadir fecha y hora" name="show_timestamps_check_im"/> <text name="log_path_desc"> - Localización de los registros: + Ruta de los registros: </text> <line_editor left="278" name="log_path_string" right="-20"/> <button label="Elegir" label_selected="Elegir" name="log_path_button" width="120"/> diff --git a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml index d7ec0b4885..4eaff8535e 100644 --- a/indra/newview/skins/default/xui/fr/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/fr/floater_buy_currency.xml @@ -4,7 +4,7 @@ Achetez [LINDENS] L$ pour environ [LOCALAMOUNT] </floater.string> <text left="5" name="info_need_more" right="-5"> - Vous avez besoin de plus de L$ + Plus de L$ sont requis </text> <text name="contacting"> En train de contacter @@ -53,7 +53,7 @@ le Lindex... Saisissez à nouveau le montant pour voir le taux de change actuel. </text> <text name="purchase_warning_repurchase"> - La confirmation de cet achat n'achète que des L$, pas l'objet. + Confirmer cet achat n'achète que des L$, pas l'objet. </text> <text bottom_delta="16" name="purchase_warning_notenough"> Vous n'achetez pas assez de L$. Veuillez augmenter le montant. diff --git a/indra/newview/skins/default/xui/fr/floater_color_picker.xml b/indra/newview/skins/default/xui/fr/floater_color_picker.xml index 8d7fe76b35..7ead543c78 100644 --- a/indra/newview/skins/default/xui/fr/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/fr/floater_color_picker.xml @@ -26,6 +26,6 @@ Couleur actuelle : </text> <text left="8" name="(Drag below to save.)" width="220"> - (Faire glisser dessous pour enregistrer.) + Enreg. : faire glisser dessous </text> </floater> diff --git a/indra/newview/skins/default/xui/fr/floater_customize.xml b/indra/newview/skins/default/xui/fr/floater_customize.xml index 0343ff0014..d5ee070dcd 100644 --- a/indra/newview/skins/default/xui/fr/floater_customize.xml +++ b/indra/newview/skins/default/xui/fr/floater_customize.xml @@ -155,7 +155,7 @@ </text> <panel label="Chemise" name="Shirt"> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/> - <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> + <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/> <button label="Créer une chemise" label_selected="Créer une chemise" name="Create New"/> <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/> @@ -188,7 +188,7 @@ </panel> <panel label="Pantalon" name="Pants"> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/> - <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> + <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/> <button label="Créer un pantalon" label_selected="Créer un pantalon" name="Create New"/> <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/> @@ -246,7 +246,7 @@ Chaussures : </text> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/> - <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> + <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/> <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/> <button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/> @@ -279,7 +279,7 @@ Chaussettes : </text> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/> - <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> + <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/> <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/> <button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/> @@ -313,7 +313,7 @@ </text> <texture_picker label="Tissu (dessus)" name="Upper Fabric" tool_tip="Cliquez pour sélectionner une image" width="81"/> <texture_picker label="Tissu (dessous)" name="Lower Fabric" tool_tip="Cliquez pour sélectionner une image" width="81"/> - <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="81"/> + <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="81"/> <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/> <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/> <button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/> @@ -346,7 +346,7 @@ Gants : </text> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/> - <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> + <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/> <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/> <button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/> @@ -379,7 +379,7 @@ Débardeur : </text> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/> - <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> + <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/> <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/> <button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/> @@ -412,7 +412,7 @@ Caleçon : </text> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/> - <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> + <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/> <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/> <button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/> @@ -445,7 +445,7 @@ Jupe : </text> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image" width="74"/> - <color_swatch label="Couleur/Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> + <color_swatch label="Coul./Teinte" name="Color/Tint" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs" width="74"/> <button label="Enlever" label_selected="Enlever" left="12" name="Take Off" width="82"/> <button label="Enregistrer" label_selected="Enregistrer" left="100" name="Save" width="82"/> <button label="Enregistrer sous..." label_selected="Enregistrer sous..." left="188" name="Save As" width="111"/> diff --git a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml index 951670ec7e..a381f64cd9 100644 --- a/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/fr/floater_day_cycle_options.xml @@ -4,7 +4,7 @@ <panel label="Cycle du jour" name="Day Cycle"> <button label="?" name="WLDayCycleHelp" /> <text name="WL12am"> - Minuit + Min. </text> <text name="WL3am"> 3h @@ -28,7 +28,7 @@ 21h </text> <text name="WL12am2"> - Minuit + Min. </text> <text name="WL12amHash"> | diff --git a/indra/newview/skins/default/xui/fr/floater_tools.xml b/indra/newview/skins/default/xui/fr/floater_tools.xml index 663f1da7b6..1d9d395960 100644 --- a/indra/newview/skins/default/xui/fr/floater_tools.xml +++ b/indra/newview/skins/default/xui/fr/floater_tools.xml @@ -355,7 +355,7 @@ </panel> <panel label="Attributs" name="Features"> <text name="select_single"> - Choisissez une prim pour changer les attributs. + Choisir une prim pour changer les attributs. </text> <text name="edit_object"> Modifier les attributs de l'objet : diff --git a/indra/newview/skins/default/xui/fr/menu_viewer.xml b/indra/newview/skins/default/xui/fr/menu_viewer.xml index ff4a40b1ce..b8a3b65101 100644 --- a/indra/newview/skins/default/xui/fr/menu_viewer.xml +++ b/indra/newview/skins/default/xui/fr/menu_viewer.xml @@ -276,7 +276,7 @@ <menu_item_check label="Atlas des textures" name="Texture Atlas"/> <menu_item_check label="Rendu des lumières jointes" name="Render Attached Lights"/> <menu_item_check label="Rendu des particules jointes" name="Render Attached Particles"/> - <menu_item_check label="Hover Glow Objects" name="Hover Glow Objects"/> + <menu_item_check label="Objets en surbrillance avec le pointeur" name="Hover Glow Objects"/> </menu> <menu label="Réseau" name="Network"> <menu_item_check label="Pauser l'avatar" name="AgentPause"/> @@ -296,7 +296,7 @@ <menu_item_call label="Arrêter l'enregistrement" name="Stop Record"/> </menu> <menu label="Monde" name="World"> - <menu_item_check label="Sim Sun Override" name="Sim Sun Override"/> + <menu_item_check label="Ignorer les paramètres du soleil de la sim" name="Sim Sun Override"/> <menu_item_check label="Balise animée" name="Cheesy Beacon"/> <menu_item_check label="Météo fixe" name="Fixed Weather"/> <menu_item_call label="Dump Region Object Cache" name="Dump Region Object Cache"/> @@ -369,14 +369,14 @@ <menu label="Admin" name="Admin"> <menu label="Object"> <menu_item_call label="Prendre une copie" name="Take Copy"/> - <menu_item_call label="Forcer le propriétaire sur moi" name="Force Owner To Me"/> + <menu_item_call label="Téléporter le propriétaire" name="Force Owner To Me"/> <menu_item_call label="Forcer la permission du propriétaire" name="Force Owner Permissive"/> <menu_item_call label="Supprimer" name="Delete"/> <menu_item_call label="Verrouiller" name="Lock"/> <menu_item_call label="Obtenir les ID d'actifs" name="Get Assets IDs"/> </menu> <menu label="Parcelle" name="Parcel"> - <menu_item_call label="Forcer le propriétaire sur moi" name="Owner To Me"/> + <menu_item_call label="Téléporter le propriétaire" name="Owner To Me"/> <menu_item_call label="Définir sur le contenu Linden" name="Set to Linden Content"/> <menu_item_call label="Réclamer un terrain public" name="Claim Public Land"/> </menu> diff --git a/indra/newview/skins/default/xui/fr/notifications.xml b/indra/newview/skins/default/xui/fr/notifications.xml index 0fb609d653..38c6b57f5c 100644 --- a/indra/newview/skins/default/xui/fr/notifications.xml +++ b/indra/newview/skins/default/xui/fr/notifications.xml @@ -178,7 +178,7 @@ Voulez-vous continuer ? <notification name="JoinGroupNoCost"> Vous vous apprêtez à rejoindre le groupe [NAME]. Voulez-vous continuer ? - <usetemplate name="okcancelbuttons" notext="Annuler" yestext="Fusionner"/> + <usetemplate name="okcancelbuttons" notext="Annuler" yestext="Rejoindre"/> </notification> <notification name="JoinGroupCannotAfford"> Rejoindre ce groupe coûte [COST] L$. diff --git a/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml b/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml index 73e136ade6..b1a437497d 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_gloves.xml @@ -2,7 +2,7 @@ <panel name="edit_gloves_panel"> <panel name="avatar_gloves_color_panel"> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/> - <color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> + <color_swatch label="Coul./Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> </panel> <accordion name="wearable_accordion"> <accordion_tab name="gloves_main_tab" title="Gants"/> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml b/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml index cee44eb795..b757f60b18 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_jacket.xml @@ -3,7 +3,7 @@ <panel name="avatar_jacket_color_panel"> <texture_picker label="Tissu (haut)" name="Upper Fabric" tool_tip="Cliquez pour sélectionner une image"/> <texture_picker label="Tissu (bas)" name="Lower Fabric" tool_tip="Cliquez pour sélectionner une image"/> - <color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> + <color_swatch label="Coul./Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> </panel> <accordion name="wearable_accordion"> <accordion_tab name="jacket_main_tab" title="Veste"/> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_pants.xml b/indra/newview/skins/default/xui/fr/panel_edit_pants.xml index 71d82c817f..0cebe1e76a 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_pants.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_pants.xml @@ -2,7 +2,7 @@ <panel name="edit_pants_panel"> <panel name="avatar_pants_color_panel"> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/> - <color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> + <color_swatch label="Coul./Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> </panel> <accordion name="wearable_accordion"> <accordion_tab name="pants_main_tab" title="Pantalon"/> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml index cf28cd8c1e..d6035415d8 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_shirt.xml @@ -2,7 +2,7 @@ <panel name="edit_shirt_panel"> <panel name="avatar_shirt_color_panel"> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/> - <color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> + <color_swatch label="Coul./Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> </panel> <accordion name="wearable_accordion"> <accordion_tab name="shirt_main_tab" title="Chemise"/> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml b/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml index a8e0910a15..ef6d72629c 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_shoes.xml @@ -2,7 +2,7 @@ <panel name="edit_shoes_panel"> <panel name="avatar_shoes_color_panel"> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/> - <color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> + <color_swatch label="Coul./Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> </panel> <accordion name="wearable_accordion"> <accordion_tab name="shoes_main_tab" title="Chaussures"/> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml index e9784b9510..1250c7819d 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_skirt.xml @@ -2,7 +2,7 @@ <panel name="edit_skirt_panel"> <panel name="avatar_skirt_color_panel"> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/> - <color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> + <color_swatch label="Coul./Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> </panel> <accordion name="wearable_accordion"> <accordion_tab name="skirt_main_tab" title="Jupe"/> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_socks.xml b/indra/newview/skins/default/xui/fr/panel_edit_socks.xml index 6fc6a3dc77..bcd69b7dc5 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_socks.xml @@ -2,7 +2,7 @@ <panel name="edit_socks_panel"> <panel name="avatar_socks_color_panel"> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/> - <color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> + <color_swatch label="Coul./Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> </panel> <accordion name="wearable_accordion"> <accordion_tab name="socks_main_tab" title="Chaussettes"/> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml b/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml index 90dcae18ec..dd2670bd75 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_underpants.xml @@ -2,7 +2,7 @@ <panel name="edit_underpants_panel"> <panel name="avatar_underpants_color_panel"> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/> - <color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> + <color_swatch label="Coul./Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> </panel> <accordion name="wearable_accordion"> <accordion_tab name="underpants_main_tab" title="Caleçon"/> diff --git a/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml b/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml index 950cdd7639..93a08f1189 100644 --- a/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml +++ b/indra/newview/skins/default/xui/fr/panel_edit_undershirt.xml @@ -2,7 +2,7 @@ <panel name="edit_undershirt_panel"> <panel name="avatar_undershirt_color_panel"> <texture_picker label="Tissu" name="Fabric" tool_tip="Cliquez pour sélectionner une image"/> - <color_swatch label="Couleur/Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> + <color_swatch label="Coul./Teinte" name="Color/Tint" width="80" tool_tip="Cliquez pour ouvrir le sélecteur de couleurs"/> </panel> <accordion name="wearable_accordion"> <accordion_tab name="undershirt_main_tab" title="Débardeur"/> diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml index afd2d9cd8f..e048e66810 100644 --- a/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/fr/panel_media_settings_general.xml @@ -8,7 +8,7 @@ </text> <line_editor name="home_url" tool_tip="La page d'accueil pour cette source média"/> <text name="preview_label"> - Prévisualiser + Aperçu </text> <text name="current_url_label"> Page actuelle : @@ -20,7 +20,7 @@ <check_box initial_value="false" label="Zoom auto" name="auto_zoom"/> <check_box initial_value="false" label="Lecture auto du média" name="auto_play"/> <text name="media_setting_note"> - Remarque : kes résidents peuvent ignorer ce paramètre + Remarque : les résidents peuvent ignorer ce paramètre </text> <check_box initial_value="false" label="Mise à l'échelle auto du média sur la face de l'objet" name="auto_scale"/> <text name="size_label"> diff --git a/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml index 6f6ae035a1..f456ee1c83 100644 --- a/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/fr/panel_media_settings_permissions.xml @@ -11,10 +11,10 @@ Mini </combo_item> </combo_box> - <check_box initial_value="false" label="Désactiver la navigation et l'interactivité" name="perms_owner_interact"/> + <check_box initial_value="false" label="Activer la navigation et l'interactivité" name="perms_owner_interact"/> <check_box initial_value="false" label="Afficher la barre de contrôles" name="perms_owner_control"/> - <check_box initial_value="false" label="Désactiver la navigation et l'interactivité" name="perms_group_interact"/> + <check_box initial_value="false" label="Activer la navigation et l'interactivité" name="perms_group_interact"/> <check_box initial_value="false" label="Afficher la barre de contrôles" name="perms_group_control"/> - <check_box initial_value="false" label="Désactiver la navigation et l'interactivité" name="perms_anyone_interact"/> + <check_box initial_value="false" label="Activer la navigation et l'interactivité" name="perms_anyone_interact"/> <check_box initial_value="false" label="Afficher la barre de contrôles" name="perms_anyone_control"/> </panel> diff --git a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml index d7757b3d9d..ef5a42555e 100644 --- a/indra/newview/skins/default/xui/fr/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/fr/panel_nearby_media.xml @@ -20,7 +20,7 @@ </panel> <panel name="nearby_media_panel"> <text name="nearby_media"> - Médias locaux + Médias proches </text> <text name="show"> Voir : diff --git a/indra/newview/skins/default/xui/fr/panel_places.xml b/indra/newview/skins/default/xui/fr/panel_places.xml index f0c40d7e92..92b0a6c1db 100644 --- a/indra/newview/skins/default/xui/fr/panel_places.xml +++ b/indra/newview/skins/default/xui/fr/panel_places.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Lieux" name="places panel"> <string name="landmarks_tab_title" value="MES REPÈRES"/> - <string name="teleport_history_tab_title" value="HISTORIQUE DES TÉLÉPORTATIONS"/> + <string name="teleport_history_tab_title" value="HISTORIQUE DES TÉLÉP."/> <filter_editor label="Filtrer les endroits" name="Filter"/> <panel name="button_panel"> <button label="Téléporter" name="teleport_btn" tool_tip="Me téléporter jusqu'à la zone sélectionnée"/> diff --git a/indra/newview/skins/default/xui/fr/strings.xml b/indra/newview/skins/default/xui/fr/strings.xml index 9bb18b1559..0ea11bb80f 100644 --- a/indra/newview/skins/default/xui/fr/strings.xml +++ b/indra/newview/skins/default/xui/fr/strings.xml @@ -3465,13 +3465,13 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. [NAME] vous a payé [AMOUNT] L$ </string> <string name="you_paid_ldollars"> - Vous avez payé [NAME] [AMOUNT] L$ [REASON]. + Vous avez payé à [AMOUNT] L$ [REASON]. </string> <string name="you_paid_ldollars_no_reason"> - Vous avez payé [NAME] [AMOUNT] L$. + Vous avez payé à [NAME] [AMOUNT] L$. </string> <string name="you_paid_ldollars_no_name"> - Vous avez payé [AMOUNT] L$ [REASON]. + Vous avez payé à [AMOUNT] L$ [REASON]. </string> <string name="for a parcel of land"> pour une parcelle de terrain @@ -3492,7 +3492,7 @@ Si ce message persiste, veuillez aller sur la page [SUPPORT_SITE]. pour charger </string> <string name="giving"> - Donne [AMOUNT] L$ + Donner [AMOUNT] L$ </string> <string name="uploading_costs"> Le chargement coûte [AMOUNT] L$ diff --git a/indra/newview/skins/default/xui/it/floater_about_land.xml b/indra/newview/skins/default/xui/it/floater_about_land.xml index 4b361f6fa6..a61b0584d3 100644 --- a/indra/newview/skins/default/xui/it/floater_about_land.xml +++ b/indra/newview/skins/default/xui/it/floater_about_land.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floaterland" title="INFO SUL TERRENO"> +<floater name="floaterland" title="INFORMAZIONI SUL TERRENO"> <floater.string name="maturity_icon_general"> "Parcel_PG_Dark" </floater.string> @@ -19,7 +19,7 @@ [SECONDS] secondi </floater.string> <floater.string name="Remaining"> - restante + rimanenti </floater.string> <tab_container name="landtab"> <panel label="GENERALE" name="land_general_panel"> @@ -144,7 +144,7 @@ Vai al menu Mondo > Informazioni sul terreno oppure seleziona un altro appezz <button label="Reclama la terra" name="Reclaim Land..."/> <button label="Vendita Linden" name="Linden Sale..." tool_tip="La terra deve essere posseduta, con contenuto impostato, e non già messa in asta."/> </panel> - <panel label="COVENANT" name="land_covenant_panel"> + <panel label="REGOLAMENTO" name="land_covenant_panel"> <panel.string name="can_resell"> La terra acquistata in questa regione può essere rivenduta. </panel.string> @@ -208,7 +208,7 @@ o suddivisa. La terra in questa regione non può essere unita/suddivisa. </text> </panel> - <panel label="OBJECTS" name="land_objects_panel"> + <panel label="OGGETTI" name="land_objects_panel"> <panel.string name="objects_available_text"> [COUNT] dei [MAX] ([AVAILABLE] disponibili) </panel.string> @@ -219,7 +219,7 @@ o suddivisa. Fattore bonus degli oggetti della regione: [BONUS] </text> <text name="Simulator primitive usage:"> - Uso dei Primative : + Uso dei Prim: </text> <text left="214" name="objects_available" width="230"> [COUNT] dei [MAX] ([AVAILABLE] dsponibili) @@ -339,7 +339,7 @@ Solamente terreni più grandi possono essere abilitati nella ricerca. </text> <check_box label="Sicuro (senza danno)" name="check safe" tool_tip="Se spuntato, imposta il terreno su 'sicuro', disabilitando i danni da combattimento. Se non spuntato, viene abilitato il combattimento a morte."/> <check_box label="Nessuna spinta" name="PushRestrictCheck" tool_tip="Previeni i colpi. Selezionare questa opzione può essere utile per prevenire comportamenti dannosi sul tuo terreno."/> - <check_box label="Mostra luogo nel Cerca (L$30/settimana)" name="ShowDirectoryCheck" tool_tip="Lascia che questa terra sia vista dagli altri nei risultati di ricerca"/> + <check_box label="Mostra luogo nella ricerca (30 L$/settimana)" name="ShowDirectoryCheck" tool_tip="Lascia che questa terra sia vista dagli altri nei risultati di ricerca"/> <combo_box left="282" name="land category with adult" width="140"> <combo_box.item label="Tutte le categorie" name="item0"/> <combo_box.item label="Luogo dei Linden" name="item1"/> @@ -428,13 +428,13 @@ Media: </panel> <panel label="SUONO" name="land_audio_panel"> <check_box label="Nascondi URL" name="hide_music_url" tool_tip="Questa opzione consente di nascondere l'url della musica a chi non è autorizzato a visionare le informazioni di questo parcel."/> - <check_box label="Attiva Voice" name="parcel_enable_voice_channel"/> - <check_box label="Attiva Voice (stabilito dalla Proprietà)" name="parcel_enable_voice_channel_is_estate_disabled"/> + <check_box label="Attiva voce" name="parcel_enable_voice_channel"/> + <check_box label="Attiva voce (stabilito dalla proprietà)" name="parcel_enable_voice_channel_is_estate_disabled"/> <check_box label="Limita il chat vocale a questo lotto" name="parcel_enable_voice_channel_local"/> </panel> <panel label="ACCESSO" name="land_access_panel"> <panel.string name="access_estate_defined"> - (Definito dalla Proprietà) + (Definito dalla proprietà) </panel.string> <panel.string name="allow_public_access"> Consenti accesso pubblico ([MATURITY]) @@ -445,11 +445,11 @@ Media: <text name="Limit access to this parcel to:"> Accesso a questo terreno </text> - <check_box label="Permetti Accesso Pubblico [MATURITY]" name="public_access"/> + <check_box label="Consenti l'accesso pubblico [MATURITY]" name="public_access"/> <text name="Only Allow"> - Accesso ristretto ai Residenti verificati con: + Consenti l'accesso soltanto ai residenti verificati tramite: </text> - <check_box label="Informazioni di pagamento on File [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Espelli i residenti non identificati."/> + <check_box label="Informazioni di pagamento in archivio [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Espelli i residenti non identificati."/> <check_box label="Verifica dell'età [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Espelli i residenti che non hanno la loro età verificata. Vedi [SUPPORT_SITE] per maggiori informazioni."/> <check_box label="Permetti accesso al gruppo: [GROUP]" name="GroupCheck" tool_tip="Imposta il gruppo nel pannello generale."/> <check_box label="Vendi pass a:" name="PassCheck" tool_tip="Permetti in questo terreno l'accesso temporaneo"/> diff --git a/indra/newview/skins/default/xui/it/floater_avatar_textures.xml b/indra/newview/skins/default/xui/it/floater_avatar_textures.xml index b2c963929f..2935f0fdb6 100644 --- a/indra/newview/skins/default/xui/it/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/it/floater_avatar_textures.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="avatar_texture_debug" title="AVATAR TEXTURES"> +<floater name="avatar_texture_debug" title="TEXTURE DI AVATAR"> <floater.string name="InvalidAvatar"> AVATAR NON VALIDO </floater.string> diff --git a/indra/newview/skins/default/xui/it/floater_beacons.xml b/indra/newview/skins/default/xui/it/floater_beacons.xml index 8fd69d811d..ca6711468d 100644 --- a/indra/newview/skins/default/xui/it/floater_beacons.xml +++ b/indra/newview/skins/default/xui/it/floater_beacons.xml @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="beacons" title="BEACONS"> +<floater name="beacons" title="MARCATORI"> <panel name="beacons_panel"> <text name="label_show"> Mostra: </text> - <check_box label="Beacons" name="beacons"/> - <check_box label="Highlights" name="highlights"/> - <text name="beacon_width_label" tool_tip="Beacon width"> + <check_box label="Marcatori" name="beacons"/> + <check_box label="In evidenza" name="highlights"/> + <text name="beacon_width_label" tool_tip="Larghezza marcatore"> Larghezza: </text> <text name="label_objects"> @@ -15,7 +15,7 @@ <check_box label="Fisico" name="physical"/> <check_box label="Scripted" name="scripted"/> <check_box label="Tocca solo" name="touch_only"/> - <check_box label="Fonte del Suono" name="sounds"/> - <check_box label="Fonte delle Particle" name="particles"/> + <check_box label="Fonti sonore" name="sounds"/> + <check_box label="Fonti delle particelle" name="particles"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_build_options.xml b/indra/newview/skins/default/xui/it/floater_build_options.xml index 233efef19b..326aab1a31 100644 --- a/indra/newview/skins/default/xui/it/floater_build_options.xml +++ b/indra/newview/skins/default/xui/it/floater_build_options.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="build options floater" title="GRID OPTIONS"> - <spinner label="Grid Units (meters)" label_width="192" name="GridResolution" width="250"/> +<floater name="build options floater" title="OPZIONI DELLA GRIGLIA"> + <spinner label="Unità griglia (metri)" label_width="192" name="GridResolution" width="250"/> <spinner label="Estensione della griglia (metri)" label_width="192" name="GridDrawSize" width="250"/> - <check_box label="Usa allineamento sub-unitario" name="GridSubUnit"/> - <check_box label="Guarda le cross-sections" name="GridCrossSection"/> - <text name="grid_opacity_label" tool_tip="Opacità della Grid"> + <check_box label="Usa sottounità" name="GridSubUnit"/> + <check_box label="Guarda le sezioni trasversali" name="GridCrossSection"/> + <text name="grid_opacity_label" tool_tip="Opacità della griglia"> Opacità: </text> <slider label="Trasparenza della griglia" name="GridOpacity" width="250"/> diff --git a/indra/newview/skins/default/xui/it/floater_buy_currency.xml b/indra/newview/skins/default/xui/it/floater_buy_currency.xml index 79b8836f3e..1327e8b172 100644 --- a/indra/newview/skins/default/xui/it/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/it/floater_buy_currency.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="buy currency" title="COMPRA L$"> +<floater name="buy currency" title="ACQUISTA L$"> <floater.string name="buy_currency"> - Compra L$ [LINDENS] per approx. [LOCALAMOUNT] + Acquista [LINDENS] L$ per circa [LOCALAMOUNT] </floater.string> <text font="SansSerifLarge" left="5" name="info_need_more" right="-5"> - Necessiti di più L$ + Ti servono più L$ </text> <text name="contacting"> Sto contattando il LindeX... </text> <text name="info_buying"> - COMPRA L$ + Acquista L$ </text> <text name="balance_label"> Io ho @@ -19,7 +19,7 @@ [AMT]L$ </text> <text name="currency_action" width="45"> - Io voglio comprare + Voglio acquistare </text> <text name="currency_label"> L$ @@ -31,10 +31,10 @@ Al prezzo </text> <text name="currency_est"> - approx. [LOCALAMOUNT] + circa [LOCALAMOUNT] </text> <text name="getting_data"> - Calcolando... + Stima in corso... </text> <text name="buy_action"> [ACTION] @@ -49,15 +49,15 @@ [http://www.secondlife.com/my/account/payment_method_management.php payment method] | [http://www.secondlife.com/my/account/currency.php currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate] </text> <text name="exchange_rate_note"> - Ri-scrivi un importo per vedere l'ultimo rapporto di cambio. + Riscrivi l'importo per vedere l'ultimo tasso al cambio. </text> <text name="purchase_warning_repurchase"> - Confermando questo acquisto di soli L$, non l'oggetto. + La conferma di questo acquisto compra solo L$, non l'oggetto. </text> <text bottom_delta="16" name="purchase_warning_notenough"> - Non stai acquistando abbastanza L$. Per favore aumenta l'importo. + Non stai acquistando abbastanza L$. Aumenta l'importo. </text> - <button label="Compra ora" name="buy_btn"/> + <button label="Acquista adesso" name="buy_btn"/> <button label="Cancella" name="cancel_btn"/> <text left="5" name="info_cannot_buy" right="-5"> Non in grado di acquistare diff --git a/indra/newview/skins/default/xui/it/floater_customize.xml b/indra/newview/skins/default/xui/it/floater_customize.xml index 1ace781a7e..75ddf43f65 100644 --- a/indra/newview/skins/default/xui/it/floater_customize.xml +++ b/indra/newview/skins/default/xui/it/floater_customize.xml @@ -459,7 +459,7 @@ [DESC]: non può essere modificato </text> <text name="title_loading"> - [DESC]: caricando... + [DESC]: caricamento in corso... </text> <text name="title_not_worn"> [DESC]: non indossato @@ -470,22 +470,22 @@ <text name="not worn instructions"> Metti un nuovo tatuaggio trascinandolo dal tuo inventario al avatar. Oppure, crea un nuovo tatuaggio e indossalo. </text> - <button label="Crea Nuovo tatuaggio" label_selected="Crea un nuovo tatuaggio" name="Create New"/> + <button label="Crea un nuovo tatuaggio" label_selected="Crea un nuovo tatuaggio" name="Create New"/> <text name="no modify instructions"> - Non hai i permessi per moficare questa vestibilità. + Non hai i permessi per modificare questo capo. </text> <text name="Item Action Label"> Tatuaggio: </text> - <texture_picker label="Tatuaggio della testa" name="Head Tattoo" tool_tip="Clicca per scegliere una foto"/> + <texture_picker label="Tatuaggio della testa" name="Head Tattoo" tool_tip="Clicca per scegliere una fotografia"/> <texture_picker label="Tatuaggio superiore" name="Upper Tattoo" tool_tip="Clicca per scegliere una fotografia"/> - <texture_picker label="Tatuaggio inferiore" name="Lower Tattoo" tool_tip="Clicca per scegliere una fotografia"/> + <texture_picker label="Tattuaggio inferiore" name="Lower Tattoo" tool_tip="Clicca per scegliere una fotografia"/> <button label="Togli" label_selected="Togli" name="Take Off"/> <button label="Salva" label_selected="Salva" name="Save"/> <button label="Salva con nome..." label_selected="Salva con nome..." name="Save As"/> <button label="Ripristina" label_selected="Ripristina" name="Revert"/> </panel> - <panel label="Alpha" name="Alpha"> + <panel label="Alpha (Trasparenza)" name="Alpha"> <text name="title"> [DESC] </text> @@ -493,7 +493,7 @@ [DESC]: non può essere modificato </text> <text name="title_loading"> - [DESC]: caricando... + [DESC]: caricamento in corso... </text> <text name="title_not_worn"> [DESC]: non indossato @@ -504,18 +504,18 @@ <text name="not worn instructions"> Metti una nuova alpha mask trascinandola dal tuo inventario al tuo avatar. Oppure, crea un nuovo tatuaggio e indossalo. </text> - <button label="Crea nuova alpha" label_selected="Crea nuova alpha" name="Create New"/> + <button label="Crea nuovo Alpha" label_selected="Crea nuovo Alpha" name="Create New"/> <text name="no modify instructions"> - Non hai i permessi per modificare questa vestibilità. + Non hai i permessi per modificare questo capo. </text> <text name="Item Action Label"> Alpha: </text> <texture_picker label="Alpha inferiore" name="Lower Alpha" tool_tip="Clicca per scegliere una fotografia"/> - <texture_picker label="Alpha superiore" name="Upper Alpha" tool_tip="Clicca per scegliere una foto"/> + <texture_picker label="Alpha superiore" name="Upper Alpha" tool_tip="Clicca per scegliere una fotografia"/> <texture_picker label="Alpha della testa" name="Head Alpha" tool_tip="Clicca per scegliere una fotografia"/> <texture_picker label="Alpha dell'occhio" name="Eye Alpha" tool_tip="Clicca per scegliere una fotografia"/> - <texture_picker label="Alpha dei capelli" name="Hair Alpha" tool_tip="Clicca per scegiere una fotografia"/> + <texture_picker label="Alpha dei capelli" name="Hair Alpha" tool_tip="Clicca per scegliere una fotografia"/> <button label="Togli" label_selected="Togli" name="Take Off"/> <button label="Salva" label_selected="Salva" name="Save"/> <button label="Salva con nome..." label_selected="Salva con nome..." name="Save As"/> diff --git a/indra/newview/skins/default/xui/it/floater_help_browser.xml b/indra/newview/skins/default/xui/it/floater_help_browser.xml index 93da2a37c9..008643afac 100644 --- a/indra/newview/skins/default/xui/it/floater_help_browser.xml +++ b/indra/newview/skins/default/xui/it/floater_help_browser.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_help_browser" title="HELP BROWSER"> +<floater name="floater_help_browser" title="BROWSER DELL'AIUTO"> <floater.string name="loading_text"> Caricamento in corso... </floater.string> diff --git a/indra/newview/skins/default/xui/it/floater_image_preview.xml b/indra/newview/skins/default/xui/it/floater_image_preview.xml index 341202d8bc..6169c0222d 100644 --- a/indra/newview/skins/default/xui/it/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/it/floater_image_preview.xml @@ -12,15 +12,15 @@ immagine come: </text> <combo_box label="Tipo d'abito" left="120" name="clothing_type_combo" width="166"> <combo_box.item label="Immagine" name="Image"/> - <combo_box.item label="Capelli" name="Hair"/> - <combo_box.item label="Testa Femminile" name="FemaleHead"/> - <combo_box.item label="Corpo Femminile Superiore" name="FemaleUpperBody"/> - <combo_box.item label="Corpo Femminile Inferiore" name="FemaleLowerBody"/> - <combo_box.item label="Testa Maschile" name="MaleHead"/> - <combo_box.item label="Corpo Maschile Superiore" name="MaleUpperBody"/> - <combo_box.item label="Corpo Maschile Inferiore" name="MaleLowerBody"/> + <combo_box.item label="Capigliature" name="Hair"/> + <combo_box.item label="Testa femminile" name="FemaleHead"/> + <combo_box.item label="Parte superiore del corpo femminile" name="FemaleUpperBody"/> + <combo_box.item label="Parte inferiore del corpo femminile" name="FemaleLowerBody"/> + <combo_box.item label="Testa maschile" name="MaleHead"/> + <combo_box.item label="Parte superiore del corpo maschile" name="MaleUpperBody"/> + <combo_box.item label="Parte inferiore del corpo maschile" name="MaleLowerBody"/> <combo_box.item label="Gonna" name="Skirt"/> - <combo_box.item label="Sculpted Prim" name="SculptedPrim"/> + <combo_box.item label="Prim Sculpted" name="SculptedPrim"/> </combo_box> <text name="bad_image_text"> Non è stato possibile leggere l'immagine. diff --git a/indra/newview/skins/default/xui/it/floater_incoming_call.xml b/indra/newview/skins/default/xui/it/floater_incoming_call.xml index 22aed7a69c..81a6ea7a60 100644 --- a/indra/newview/skins/default/xui/it/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/it/floater_incoming_call.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="incoming call" title="UNA PERSONA SCONOSCIUTA STA' CHIAMANDO"> +<floater name="incoming call" title="UNA PERSONA SCONOSCIUTA STA CHIAMANDO"> <floater.string name="lifetime"> 5 </floater.string> <floater.string name="localchat"> - Voice Chat nei dintorni + Chat vocale nei dintorni </floater.string> <floater.string name="anonymous"> anonimo </floater.string> <floater.string name="VoiceInviteP2P"> - stà chiamando. + sta chiamando. </floater.string> <floater.string name="VoiceInviteAdHoc"> - ha aggiunto una chiamata in Voice Chat ad una conferenza in chat. + ha aderito ad una chiamata in chat vocale in conferenza. </floater.string> <floater.string name="VoiceInviteGroup"> ha accettato una chiamata in Chat vocale con il gruppo [GROUP]. diff --git a/indra/newview/skins/default/xui/it/floater_lagmeter.xml b/indra/newview/skins/default/xui/it/floater_lagmeter.xml index 93bf11b069..f7b2b1ab4a 100644 --- a/indra/newview/skins/default/xui/it/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/it/floater_lagmeter.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_lagmeter" title="LAG METER"> +<floater name="floater_lagmeter" title="MISURATORE LAG"> <floater.string name="max_title_msg"> Misuratore del lag </floater.string> @@ -136,7 +136,7 @@ <text left="30" name="client_lag_cause" right="-10"/> <button label="" label_selected="" name="network_lagmeter" tool_tip="Stato del lag del network"/> <text name="network"> - Network + Rete </text> <text font="SansSerifSmall" name="network_text"> Normale @@ -150,5 +150,5 @@ Normale </text> <text left="30" name="server_lag_cause" right="-32"/> - <button label=">>" name="minimize" tool_tip="Pulsante per minimizzare"/> + <button label=">>" name="minimize" tool_tip="Cambia dimensioni floater"/> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_media_settings.xml b/indra/newview/skins/default/xui/it/floater_media_settings.xml index b99a11b881..d521502a4c 100644 --- a/indra/newview/skins/default/xui/it/floater_media_settings.xml +++ b/indra/newview/skins/default/xui/it/floater_media_settings.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="media_settings" title="IMPOSTAZIONI MEDIA"> <button label="OK" label_selected="OK" name="OK"/> - <button label="Cancella" label_selected="Cancella" name="Cancel"/> + <button label="Annulla" label_selected="Annulla" name="Cancel"/> <button label="Applica" label_selected="Applica" name="Apply"/> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_nearby_chat.xml b/indra/newview/skins/default/xui/it/floater_nearby_chat.xml index 364b62fbdb..9878fe85ea 100644 --- a/indra/newview/skins/default/xui/it/floater_nearby_chat.xml +++ b/indra/newview/skins/default/xui/it/floater_nearby_chat.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="nearby_chat" title="CHAT VICINA"/> +<floater name="nearby_chat" title="CHAT NEI DINTORNI"/> diff --git a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml index 41d4fdfce2..4e926cedc9 100644 --- a/indra/newview/skins/default/xui/it/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_gesture.xml @@ -50,18 +50,18 @@ <text name="steps_label"> Fasi: </text> - <button label="Sù" name="up_btn"/> + <button label="Su" name="up_btn"/> <button label="Giù" name="down_btn"/> <button label="Elimina" name="delete_btn"/> <radio_group name="animation_trigger_type"> - <radio_item label="Inizia" name="start"/> - <radio_item label="Stop" name="stop"/> + <radio_item label="Attiva" name="start"/> + <radio_item label="Ferma" name="stop"/> </radio_group> <check_box label="finché le animazioni sono eseguite" left="226" name="wait_anim_check"/> <check_box label="tempo in secondi" name="wait_time_check"/> <line_editor left_delta="114" name="wait_time_editor"/> <text name="help_label"> - Tutte le fasi avvengono simultaneamente, a meno che non aggiungi una fase attendi. + Tutte le fasi avvengono contemporaneamente, a meno che non aggiungi fasi di attesa. </text> <check_box label="Attiva" name="active_check" tool_tip="Le gesture attivate possono essere eseguite scrivendo in chat la parola chiave o premendo i tasti chiave. Le gesture generalmente si disattivano quando c'è un conflitto nei relativi tasti."/> <button label="Anteprima" name="preview_btn"/> diff --git a/indra/newview/skins/default/xui/it/floater_preview_gesture_info.xml b/indra/newview/skins/default/xui/it/floater_preview_gesture_info.xml index 660b868cae..d490416cc7 100644 --- a/indra/newview/skins/default/xui/it/floater_preview_gesture_info.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_gesture_info.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Gesture" title="GESTURE SHORTCUT"/> +<floater name="Gesture" title="SCORCIATOIA GESTURE"/> diff --git a/indra/newview/skins/default/xui/it/floater_preview_gesture_shortcut.xml b/indra/newview/skins/default/xui/it/floater_preview_gesture_shortcut.xml index 942d5ed1ce..eb0bc4d868 100644 --- a/indra/newview/skins/default/xui/it/floater_preview_gesture_shortcut.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_gesture_shortcut.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Gesture" title="TASTO RAPIDO PER GESTURE"> +<floater name="Gesture" title="SCORCIATOIA GESTURE"> <text name="trigger_label"> Chat: </text> @@ -8,8 +8,8 @@ </text> <combo_box label="Nessuno" name="modifier_combo"/> <combo_box label="Nessuno" name="key_combo"/> - <text name="replace_text" tool_tip="Sostituisci la parola chiave con queste parole. Per esempio, parola chiave 'ciao' sostituendo con 'buongiorno' cambierà la chat da 'Io dico ciao' in 'Io dico buongiorno' non appena attiverete la gesture!"> + <text name="replace_text" tool_tip="Sostituisci la parola chiave con queste parole. Per esempio, se si sceglie di sostituire la parola chiave 'ciao' con 'buongiorno', nella chat il testo 'Volevo dire ciao' diventerà 'Volevo dire buongiorno' e verrà attivata la gesture."> Sostituisci: </text> - <line_editor name="replace_editor" tool_tip="Sostituisci la parola chiave con queste parole. Per esempio, parola chiave 'ciao' sostituendo con 'buongiorno' cambierà la chat da 'Io dico ciao' in 'Io dico buongiorno' non appena attiverete la gesture"/> + <line_editor name="replace_editor" tool_tip="Sostituisci la parola chiave con queste parole. Per esempio, se si sceglie di sostituire la parola chiave 'ciao' con 'buongiorno', nella chat il testo 'Volevo dire ciao' diventerà 'Volevo dire buongiorno' e verrà attivata la gesture"/> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_preview_gesture_steps.xml b/indra/newview/skins/default/xui/it/floater_preview_gesture_steps.xml index 7c1f55ddba..d490416cc7 100644 --- a/indra/newview/skins/default/xui/it/floater_preview_gesture_steps.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_gesture_steps.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Gesture" title="TASTO RAPIDO GESTURE"/> +<floater name="Gesture" title="SCORCIATOIA GESTURE"/> diff --git a/indra/newview/skins/default/xui/it/floater_preview_notecard.xml b/indra/newview/skins/default/xui/it/floater_preview_notecard.xml index 726152d147..70e28dde35 100644 --- a/indra/newview/skins/default/xui/it/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_notecard.xml @@ -7,7 +7,7 @@ Non hai il permesso di leggere questo biglietto. </floater.string> <floater.string name="Title"> - Notecard: [NAME] + Biglietto: [NAME] </floater.string> <floater.string label="Salva" label_selected="Salva" name="Save"> Salva diff --git a/indra/newview/skins/default/xui/it/floater_preview_texture.xml b/indra/newview/skins/default/xui/it/floater_preview_texture.xml index e59f707ce7..5b4054514e 100644 --- a/indra/newview/skins/default/xui/it/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/it/floater_preview_texture.xml @@ -10,31 +10,31 @@ Descrizione: </text> <text name="dimensions"> - [WIDTH]px x [HEIGHT]px + [WIDTH] px x [HEIGHT] px </text> <text name="aspect_ratio"> Antreprima rapporto di visualizzazione </text> - <combo_box name="combo_aspect_ratio" tool_tip="Anteprima del rapporto d'aspetto impostato"> + <combo_box name="combo_aspect_ratio" tool_tip="Anteprima con rapporto di visualizzazione fisso"> <combo_item name="Unconstrained"> Libero </combo_item> - <combo_item name="1:1" tool_tip="Immagine del Gruppo o Profilo nel Mondo Reale"> + <combo_item name="1:1" tool_tip="Logo del gruppo o profilo nel mondo reale"> 1:1 </combo_item> - <combo_item name="4:3" tool_tip="[SECOND_LIFE] profilo"> + <combo_item name="4:3" tool_tip="Profilo [SECOND_LIFE]"> 4:3 </combo_item> - <combo_item name="10:7" tool_tip="Annunci ed elenco del Cerca, landmarks"> + <combo_item name="10:7" tool_tip="Annunci e inserzioni, punti di riferimento"> 10:7 </combo_item> - <combo_item name="3:2" tool_tip="Info sul terreno"> + <combo_item name="3:2" tool_tip="Informazioni sul terreno"> 3:2 </combo_item> <combo_item name="16:10"> 16:10 </combo_item> - <combo_item name="16:9" tool_tip="Preferiti nel Profilo"> + <combo_item name="16:9" tool_tip="Preferiti del Profilo"> 16:9 </combo_item> <combo_item name="2:1"> @@ -43,5 +43,5 @@ </combo_box> <button label="OK" name="Keep"/> <button label="Elimina" name="Discard"/> - <button label="Salva come:" name="save_tex_btn"/> + <button label="Salva con nome" name="save_tex_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_settings_debug.xml b/indra/newview/skins/default/xui/it/floater_settings_debug.xml index 3dc7ee010e..aab00a26ce 100644 --- a/indra/newview/skins/default/xui/it/floater_settings_debug.xml +++ b/indra/newview/skins/default/xui/it/floater_settings_debug.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="settings_debug" title="DEBUG SETTINGS"> +<floater name="settings_debug" title="PARAMETRI DI DEBUG"> <radio_group name="boolean_combo"> <radio_item label="VERO" name="TRUE" value="vero"/> <radio_item label="FALSO" name="FALSE" value=""/> diff --git a/indra/newview/skins/default/xui/it/floater_sys_well.xml b/indra/newview/skins/default/xui/it/floater_sys_well.xml index 1acdfa2815..e1c0b89902 100644 --- a/indra/newview/skins/default/xui/it/floater_sys_well.xml +++ b/indra/newview/skins/default/xui/it/floater_sys_well.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="sys_well_window" title="NOTIFICHE"> +<floater name="sys_well_window" title="AVVISI"> <string name="title_im_well_window"> CONVERSAZIONI </string> <string name="title_notification_well_window"> - NOTIFICHE + AVVISI </string> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_telehub.xml b/indra/newview/skins/default/xui/it/floater_telehub.xml index 08f5564c7b..15312a8959 100644 --- a/indra/newview/skins/default/xui/it/floater_telehub.xml +++ b/indra/newview/skins/default/xui/it/floater_telehub.xml @@ -21,9 +21,9 @@ <button label="Aggiungi punti rigenerazione" name="add_spawn_point_btn" width="165"/> <button label="Rimuovi punti" left="175" name="remove_spawn_point_btn" width="105"/> <text name="spawn_point_help"> - Seleziona un oggetto e click "Aggiungi Spawn" per specificare la posizione. + Seleziona un oggetto e fai clic su Aggiungi per specificare la posizione. Ora puoi spostare o cancellare l'oggetto. -Le Posizioni sono relative al centro del telehub. +Le posizioni sono relative al centro del telehub. Seleziona un oggetto nella lista per evidenziarlo nel mondo. </text> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_tools.xml b/indra/newview/skins/default/xui/it/floater_tools.xml index dda957025b..16ee797ce4 100644 --- a/indra/newview/skins/default/xui/it/floater_tools.xml +++ b/indra/newview/skins/default/xui/it/floater_tools.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="toolbox floater" short_title="STRUMENTI/ATTREZZI PER COSTRUIRE" title="" width="288"> +<floater name="toolbox floater" short_title="STRUMENTI PER COSTRUZIONE" title="" width="288"> <floater.string name="status_rotate"> Sposta le fasce colorate per ruotare l'oggetto </floater.string> @@ -16,7 +16,7 @@ Clicca e trascina per spostare la camera </floater.string> <floater.string name="status_grab"> - Trascina per spostare, Ctrl per sollevare, Ctrl+Shift per ruotare + Trascina per spostare, Ctrl per sollevare, Ctrl+Maiusc per ruotare </floater.string> <floater.string name="status_place"> Clicca inworld per costruire @@ -50,32 +50,32 @@ <radio_group name="focus_radio_group"> <radio_item label="Zoom" name="radio zoom"/> <radio_item label="Guarda ruotando (Ctrl)" name="radio orbit"/> - <radio_item label="Panoramica (Ctrl+Shift)" name="radio pan"/> + <radio_item label="Panoramica (Ctrl+Maiusc)" name="radio pan"/> </radio_group> <radio_group name="move_radio_group"> <radio_item label="Muovi" name="radio move"/> <radio_item label="Alza (Ctrl)" name="radio lift"/> - <radio_item label="Ruota (Ctrl+Shift)" name="radio spin"/> + <radio_item label="Gira (Ctrl+Maiusc)" name="radio spin"/> </radio_group> <radio_group name="edit_radio_group"> <radio_item label="Sposta" name="radio position"/> <radio_item label="Ruota (Ctrl)" name="radio rotate"/> - <radio_item label="Estendi/Stira???!!!! (Ctrl+Shift)" name="radio stretch"/> - <radio_item label="Seleziona Faccia multimediale" name="radio select face"/> + <radio_item label="Allunga (Ctrl+Maiusc)" name="radio stretch"/> + <radio_item label="Seleziona faccia" name="radio select face"/> </radio_group> <check_box label="Modifica parti collegate" name="checkbox edit linked parts"/> - <text name="RenderingCost" tool_tip="Mostra il rendering cost calcolato per questo oggetto"> + <text name="RenderingCost" tool_tip="Mostra il costo di rendering calcolato per questo oggetto"> þ: [COUNT] </text> <check_box label="Ridimens. simmetricamente" name="checkbox uniform"/> <check_box initial_value="true" label="Ridimensiona le texture" name="checkbox stretch textures"/> - <check_box initial_value="true" label="Posiziona nella rete???!!!" name="checkbox snap to grid"/> + <check_box initial_value="true" label="Posiziona nella griglia" name="checkbox snap to grid"/> <combo_box left_delta="48" name="combobox grid mode" tool_tip="Scegli il tipo di righello per posizionare l'oggetto"> - <combo_box.item label="Rete del Mondo" name="World"/> + <combo_box.item label="Rete del mondo" name="World"/> <combo_box.item label="Rete locale" name="Local"/> - <combo_box.item label="Riferimento della rete???!!!!" name="Reference"/> + <combo_box.item label="Griglia di riferimento" name="Reference"/> </combo_box> - <button label="Opzioni..." label_selected="Opzioni..." name="Options..." tool_tip="Vedi più opzioni delle rete"/> + <button label="Opzioni..." label_selected="Opzioni..." name="Options..." tool_tip="Vedi più opzioni della griglia"/> <button label="" label_selected="" name="ToolCube" tool_tip="Cubo"/> <button label="" label_selected="" name="ToolPrism" tool_tip="Prisma"/> <button label="" label_selected="" name="ToolPyramid" tool_tip="Piramide"/> @@ -91,10 +91,10 @@ <button label="" label_selected="" name="ToolRing" tool_tip="Anello"/> <button label="" label_selected="" name="ToolTree" tool_tip="Albero"/> <button label="" label_selected="" name="ToolGrass" tool_tip="Erba"/> - <check_box label="Mantieni lo strumento/attrezzo selezionato" name="checkbox sticky"/> - <check_box label="Seleziona la Copia" name="checkbox copy selection"/> - <check_box initial_value="true" label="Centra la Copia" name="checkbox copy centers"/> - <check_box label="Ruotare la Copia" name="checkbox copy rotates"/> + <check_box label="Mantieni lo strumento selezionato" name="checkbox sticky"/> + <check_box label="Copia la selezione" name="checkbox copy selection"/> + <check_box initial_value="true" label="Centra la copia" name="checkbox copy centers"/> + <check_box label="Ruota la copia" name="checkbox copy rotates"/> <radio_group name="land_radio_group"> <radio_item label="Seleziona il terreno" name="radio select land"/> <radio_item label="Appiattisci" name="radio flatten"/> @@ -114,26 +114,26 @@ <text name="Strength:"> Potenza </text> - <button label="Applica" label_selected="Applica" left="146" name="button apply to selection" tool_tip="Modifica la terra selezionata"/> + <button label="Applica" label_selected="Applica" left="146" name="button apply to selection" tool_tip="Modifica il terreno selezionato"/> <text left="134" name="obj_count"> Oggetti: [COUNT] </text> <text left="134" name="prim_count"> - Prims: [COUNT] + Prim: [COUNT] </text> <tab_container name="Object Info Tabs" tab_max_width="150" tab_min_width="30" width="288"> <panel label="Generale" name="General"> <panel.string name="text deed continued"> - Intesta + Cessione </panel.string> <panel.string name="text deed"> Cedi al gruppo </panel.string> <panel.string name="text modify info 1"> - Puoi modificare questo oggetto + Tu puoi modificare questo oggetto </panel.string> <panel.string name="text modify info 2"> - Puoi modificare questi oggetti + Tu puoi modificare questi oggetti </panel.string> <panel.string name="text modify info 3"> Non puoi modificare questo oggetto @@ -148,10 +148,10 @@ Prezzo: L$ </panel.string> <panel.string name="Cost Total"> - Prezzo Totale: L$ + Prezzo totale: L$ </panel.string> <panel.string name="Cost Per Unit"> - Prezzo per Unità: L$ + Prezzo per: L$ </panel.string> <panel.string name="Cost Mixed"> Prezzo misto @@ -180,20 +180,20 @@ <text name="Group:"> Gruppo: </text> - <button label="Imposta..." label_selected="Imposta..." name="button set group" tool_tip="Scegli un gruppo per condividere i permessi di questo oggetto"/> - <name_box initial_value="Caricando..." name="Group Name Proxy"/> - <button label="Intesta" label_selected="Intesta" left_delta="152" name="button deed" tool_tip="Intestando permette di regalare questo oggetto con i permessi del prossimo proprietario. Gli oggetti condivisi dal gruppo posso essere instestati solo da un officer del gruppo." width="98"/> - <check_box label="Condividi" name="checkbox share with group" tool_tip="Permetti ai membri del gruppo selezionato di condividere i tuoi permessi modify per questo oggetto. Tu devi Intestare per attivare le restrizioni al ruolo."/> + <button label="Imposta..." label_selected="Imposta..." name="button set group" tool_tip="Scegli un gruppo con cui condividere i diritti relativi all'oggetto"/> + <name_box initial_value="Caricamento in corso..." name="Group Name Proxy"/> + <button label="Cessione" label_selected="Cessione" left_delta="152" name="button deed" tool_tip="Con una cessione si trasferisce il bene con i diritti al proprietario successivo Gli oggetti in proprietà condivisa di gruppo possono essere ceduti soltanto da un funzionario del gruppo." width="98"/> + <check_box label="Condividi" name="checkbox share with group" tool_tip="Consenti a tutti i membri del gruppo selezionato di condividere i tuoi diritti di modifica di questo oggetto. Per attivare le restrizioni per ruolo devi prima effettuare la cessione."/> <text name="label click action" width="220"> - Clicca: + Fai clic per: </text> <combo_box name="clickaction" width="192"> - <combo_box.item label="Tocca (default)" name="Touch/grab(default)"/> + <combo_box.item label="Tocca (predefinito)" name="Touch/grab(default)"/> <combo_box.item label="Siediti sull'oggetto" name="Sitonobject"/> <combo_box.item label="Compra l'oggetto" name="Buyobject"/> <combo_box.item label="Paga l'oggetto" name="Payobject"/> <combo_box.item label="Apri" name="Open"/> - <combo_box.item label="Zoom" name="Zoom"/> + <combo_box.item label="Ingrandisci" name="Zoom"/> </combo_box> <check_box label="In vendita:" name="checkbox for sale"/> <combo_box name="sale type"> @@ -205,7 +205,7 @@ <check_box label="Mostra nella ricerca" name="search_check" tool_tip="Permetti che l'oggetto sia visibile nella ricerca"/> <panel name="perms_build"> <text name="perm_modify"> - Puoi modificare questo oggetto + Tu puoi modificare questo oggetto </text> <text name="Anyone can:"> Chiunque: @@ -213,11 +213,11 @@ <check_box label="Sposta" name="checkbox allow everyone move"/> <check_box label="Copia" name="checkbox allow everyone copy"/> <text name="Next owner can:"> - Prossimo proprietario: + Proprietario successivo: </text> <check_box label="Modificare" name="checkbox next owner can modify"/> <check_box label="Copiare" left_delta="80" name="checkbox next owner can copy"/> - <check_box label="Transfer" left_delta="67" name="checkbox next owner can transfer" tool_tip="Il prossimo proprietario può regalare o rivendere questo oggetto"/> + <check_box label="Trasferisci" left_delta="67" name="checkbox next owner can transfer" tool_tip="Il prossimo proprietario può regalare o rivendere questo oggetto"/> <text name="B:"> B: </text> @@ -241,7 +241,7 @@ <panel label="Oggetto" name="Object"> <check_box label="Bloccato" name="checkbox locked" tool_tip="Previene lo spostamento o la cancellazione dell'oggetto. Spesso utile mentre si costruisce per evitare involontarie modifiche."/> <check_box label="Fisico" name="Physical Checkbox Ctrl" tool_tip="Permette all'oggetto di essere spostato e di subire gli effetti della gravità"/> - <check_box label="Temporaneo" name="Temporary Checkbox Ctrl" tool_tip="Causa la cancellazione dell'oggetto 1 minuto dopo la sua creazione"/> + <check_box label="Temporaneo" name="Temporary Checkbox Ctrl" tool_tip="Determina la cancellazione dell'oggetto 1 minuto dopo la sua creazione"/> <check_box label="Fantasma" name="Phantom Checkbox Ctrl" tool_tip="Rende l'oggetto penetrabile dagli altri oggetti e dagli avatars"/> <text name="label position"> Posizione (metri) @@ -281,7 +281,7 @@ <combo_box.item label="Gomma" name="Rubber"/> </combo_box> <text name="text cut"> - Riduci una sezione (begin/end) + Riduci una sezione (inizio/fine) </text> <spinner label="I" name="cut begin"/> <spinner label="F" name="cut end"/> @@ -301,7 +301,7 @@ <combo_box.item label="Triangolare" name="Triangle"/> </combo_box> <text name="text twist"> - Attorciglia (begin/end) + Attorciglia (inizio/fine) </text> <spinner label="I" name="Twist Begin"/> <spinner label="F" name="Twist End"/> @@ -319,13 +319,13 @@ <spinner label="X" name="Shear X"/> <spinner label="Y" name="Shear Y"/> <text name="advanced_cut" width="149"> - Riduci un bordo (begin/end) + Riduci un bordo (inizio/fine) </text> <text name="advanced_dimple"> - Fossetta???!!!! (begin/end) + Scava (inizio/fine) </text> <text name="advanced_slice"> - Taglia???!!! (begin/end) + Taglia (inizio/fine) </text> <spinner label="I" name="Path Limit Begin"/> <spinner label="F" name="Path Limit End"/> @@ -361,7 +361,7 @@ <text name="edit_object"> Modifica le caratteristiche dell'oggetto: </text> - <check_box label="Flessibilità" name="Flexible1D Checkbox Ctrl" tool_tip="Permetti all'oggetto di flettersi lungo l'asse Z (Client-side only)"/> + <check_box label="Flessibilità" name="Flexible1D Checkbox Ctrl" tool_tip="Consenti all'oggetto di flettersi lungo l'asse Z (solo lato client)"/> <spinner label="Morbidezza" label_width="72" name="FlexNumSections" width="135"/> <spinner label="Gravità" label_width="72" name="FlexGravity" width="135"/> <spinner label="Elasticità" label_width="72" name="FlexFriction" width="135"/> @@ -372,11 +372,11 @@ <spinner label="Forza Z" label_width="72" name="FlexForceZ" width="135"/> <check_box label="Luce" name="Light Checkbox Ctrl" tool_tip="Imposta l'oggetto come sorgente di luce"/> <color_swatch label="" name="colorswatch" tool_tip="Clicca per aprire il selettore dei colori"/> - <texture_picker label="" name="light texture control" tool_tip="Clicca per scegliere una proiezione dell'immagine (funziona solo con deferred rendering attivato)"/> + <texture_picker label="" name="light texture control" tool_tip="Clicca per scegliere un'immagine da proiettare (funziona solo con il rendering differito attivato)"/> <spinner label="Intensità" label_width="72" name="Light Intensity" width="135"/> - <spinner label="FOV" name="Light FOV"/> + <spinner label="Angolo di vista" name="Light FOV"/> <spinner label="Raggio" label_width="72" name="Light Radius" width="135"/> - <spinner label="Focus" name="Light Focus"/> + <spinner label="Centro focale" name="Light Focus"/> <spinner label="Attenuazione" label_width="72" name="Light Falloff" width="135"/> <spinner label="Atmosfera" name="Light Ambiance"/> </panel> @@ -395,8 +395,7 @@ <text name="glow label"> Bagliore </text> - <check_box bottom_delta="-21" label="Massima -luminosità" name="checkbox fullbright"/> + <check_box bottom_delta="-21" label="Massima luminosità" name="checkbox fullbright"/> <text name="tex gen"> Applicazione della texture @@ -438,32 +437,32 @@ della texture <combo_box.item label="Trama" name="weave"/> </combo_box> <text name="tex scale"> - Ripeti / Lato + Ripetizioni / Faccia </text> <spinner label="Orizzontale (U)" name="TexScaleU"/> <check_box label="Inverti" name="checkbox flip s"/> <spinner label="Verticale (V)" name="TexScaleV"/> <check_box label="Inverti" name="checkbox flip t"/> <spinner label="Rotazione˚" left="120" name="TexRot" width="60"/> - <spinner label="Ripete / Metri" left="120" name="rptctrl" width="60"/> + <spinner label="Ripetizioni / Metro" left="120" name="rptctrl" width="60"/> <button label="Applica" label_selected="Applica" left_delta="72" name="button apply"/> <text name="tex offset"> - Bilanciamento della Texture + Bilanciamento della texture </text> <spinner label="Orizzontale (U)" name="TexOffsetU"/> <spinner label="Verticale (V)" name="TexOffsetV"/> <panel name="Add_Media"> <text name="media_tex"> - Media + Multimediale </text> - <button name="add_media" tool_tip="Aggiungi Media"/> + <button name="add_media" tool_tip="Aggiungi media"/> <button name="delete_media" tool_tip="Cancella questa media texture"/> - <button name="edit_media" tool_tip="Modifica questo Media"/> - <button label="Alllinea" label_selected="Allinea Media" name="button align" tool_tip="Allinea media texture (must load first)"/> + <button name="edit_media" tool_tip="Modifica questo media"/> + <button label="Alllinea" label_selected="Allinea media" name="button align" tool_tip="Allinea texture del media (il caricamento deve prima essere completato)"/> </panel> </panel> <panel label="Contenuto" name="Contents"> - <button label="Nuovo Script" label_selected="Nuovo Script" name="button new script"/> + <button label="Nuovo Script" label_selected="Nuovo script" name="button new script"/> <button label="Permessi" name="button permissions"/> </panel> </tab_container> @@ -472,29 +471,22 @@ della texture Informazioni sul terreno </text> <text name="label_area_price"> - Prezzo: L$[PRICE] per [AREA] m² + Prezzo: L$ [PRICE] per [AREA] m² </text> <text name="label_area"> - Area: [AREA] m² + Zona: [AREA] m² </text> - <button label="Info sul terreno" label_selected="Info sul terreno" name="button about land" width="156"/> - <check_box label="Mostra i proprietari" name="checkbox show owners" tool_tip="Colora i terreni in base ai loro proprietari: - -Verde = il tuo terreno -Acqua = la terra del tuo gruppo -Rosso = posseduta da altri -Giallo = in vendita -Viola = in asta -Grigia = pubblica"/> + <button label="Informazioni sui terreni" label_selected="Informazioni sui terreni" name="button about land" width="156"/> + <check_box label="Mostra i proprietari" name="checkbox show owners" tool_tip="Colora i terreni in base ai loro proprietari: Verde = il tuo terreno Acqua = la terra del tuo gruppo Rosso = posseduta da altri Giallo = in vendita Viola = in asta Grigia = pubblica"/> <text name="label_parcel_modify"> Modifica il terreno </text> <button label="Suddividi" label_selected="Suddividi" name="button subdivide land" width="156"/> - <button label="Aderisci" label_selected="Aderisci" name="button join land" width="156"/> + <button label="Iscriviti" label_selected="Iscriviti" name="button join land" width="156"/> <text name="label_parcel_trans"> Transazioni del territorio </text> - <button label="Compra la Terra" label_selected="Compra la Terra" name="button buy land" width="156"/> - <button label="Abbandona la Terra" label_selected="Abbandona la Terra" name="button abandon land" width="156"/> + <button label="Acquista terreno" label_selected="Acquista terreno" name="button buy land" width="156"/> + <button label="Abbandona il terreno" label_selected="Abbandona il terreno" name="button abandon land" width="156"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/it/floater_voice_controls.xml b/indra/newview/skins/default/xui/it/floater_voice_controls.xml index c2375f357a..07368da0dd 100644 --- a/indra/newview/skins/default/xui/it/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/it/floater_voice_controls.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="floater_voice_controls" title="Controlli del Voice"> +<floater name="floater_voice_controls" title="Regolazione voce"> <string name="title_nearby"> - VOICE NEI DINTORNI + VOCE NEI DINTORNI </string> <string name="title_group"> - Chiamata di Gruppo con [GROUP] + Chiamata di gruppo con [GROUP] </string> <string name="title_adhoc"> - Conference Call + Chiamata in conferenza </string> <string name="title_peer_2_peer"> - Chiama con [NAME] + Chiamata con [NAME] </string> <string name="no_one_near"> Nessuno nei dintorni ha attivato la funzione voce diff --git a/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml b/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml index a8e07f73a4..9abc968b94 100644 --- a/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml +++ b/indra/newview/skins/default/xui/it/floater_whitelist_entry.xml @@ -5,5 +5,5 @@ </text> <line_editor name="whitelist_entry" tool_tip="Inserisci un URL o una configurazione URL alla lista bianca"/> <button label="OK" name="ok_btn"/> - <button label="Cancella" name="cancel_btn"/> + <button label="Annulla" name="cancel_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/it/inspect_object.xml b/indra/newview/skins/default/xui/it/inspect_object.xml index 7e6d195cb1..fd58c18e0b 100644 --- a/indra/newview/skins/default/xui/it/inspect_object.xml +++ b/indra/newview/skins/default/xui/it/inspect_object.xml @@ -9,10 +9,10 @@ </string> <string name="CreatorAndOwner"> Di [CREATOR] -owner [OWNER] +proprietario [OWNER] </string> <string name="Price"> - L$[AMOUNT] + L$ [AMOUNT] </string> <string name="PriceFree"> Gratis! @@ -21,14 +21,14 @@ owner [OWNER] Tocca </string> <string name="Sit"> - Siedi + Siediti </string> - <button label="Compra" name="buy_btn"/> + <button label="Acquista" name="buy_btn"/> <button label="Paga" name="pay_btn"/> - <button label="Fai una Copia" name="take_free_copy_btn"/> + <button label="Prendi copia" name="take_free_copy_btn"/> <button label="Tocca" name="touch_btn"/> - <button label="Siedi" name="sit_btn"/> + <button label="Siediti" name="sit_btn"/> <button label="Apri" name="open_btn"/> - <icon name="secure_browsing" tool_tip="Secure Browsing"/> - <button label="Ulteriore" name="more_info_btn"/> + <icon name="secure_browsing" tool_tip="Browsing sicuro"/> + <button label="Altro" name="more_info_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/it/mime_types_linux.xml b/indra/newview/skins/default/xui/it/mime_types_linux.xml index 5db3eddca8..3bc30b507a 100644 --- a/indra/newview/skins/default/xui/it/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/it/mime_types_linux.xml @@ -2,24 +2,24 @@ <mimetypes name="default"> <widgetset name="web"> <label name="web_label"> - Contenuto del Web + Contenuti Web </label> <tooltip name="web_tooltip"> - Questo luogo ha un contenuto Web + Questo luogo presenta contenuti Web </tooltip> <playtip name="web_playtip"> - Mostra il contenuto Web + Mostra contenuti Web </playtip> </widgetset> <widgetset name="movie"> <label name="movie_label"> - Video + Filmato </label> <tooltip name="movie_tooltip"> - Qui c'è un video da riprodurre + C'è un filmato da vedere qui </tooltip> <playtip name="movie_playtip"> - Riproduci video + Riproduci il filmato </playtip> </widgetset> <widgetset name="image"> @@ -27,10 +27,10 @@ Immagine </label> <tooltip name="image_tooltip"> - C'è un immagine in questo luogo + C'è un'immagine in questo luogo </tooltip> <playtip name="image_playtip"> - Guarda l'immagine di questo luogo + Vedi l'immagine di questo luogo </playtip> </widgetset> <widgetset name="audio"> @@ -38,25 +38,25 @@ Audio </label> <tooltip name="audio_tooltip"> - In questo luogo c'è l'audio + C'è un audio in questo luogo </tooltip> <playtip name="audio_playtip"> - Riproduci l'audio in questo luogo + Riproduci l'audio di questo luogo </playtip> </widgetset> <scheme name="rtsp"> <label name="rtsp_label"> - Real Time Streaming + Streaming in tempo reale </label> </scheme> <mimetype name="blank"> <label name="blank_label"> - - Vuoto - + - Nessuno - </label> </mimetype> <mimetype name="none/none"> <label name="none/none_label"> - - Vuoto - + - Nessuno - </label> </mimetype> <mimetype name="audio/*"> @@ -76,7 +76,7 @@ </mimetype> <mimetype name="video/vnd.secondlife.qt.legacy"> <label name="vnd.secondlife.qt.legacy_label"> - Video (QuickTime) + Filmato (QuickTime) </label> </mimetype> <mimetype name="application/javascript"> @@ -116,7 +116,7 @@ </mimetype> <mimetype name="application/x-director"> <label name="application/x-director_label"> - Direttore Macromedia + Macromedia Director </label> </mimetype> <mimetype name="audio/mid"> @@ -186,32 +186,32 @@ </mimetype> <mimetype name="video/mpeg"> <label name="video/mpeg_label"> - Video (MPEG) + Filmato (MPEG) </label> </mimetype> <mimetype name="video/mp4"> <label name="video/mp4_label"> - Video (MP4) + Filmato (MP4) </label> </mimetype> <mimetype name="video/quicktime"> <label name="video/quicktime_label"> - Video (QuickTime) + Filmato (QuickTime) </label> </mimetype> <mimetype name="video/x-ms-asf"> <label name="video/x-ms-asf_label"> - Video (Windows Media ASF) + Filmato (Windows Media ASF) </label> </mimetype> <mimetype name="video/x-ms-wmv"> <label name="video/x-ms-wmv_label"> - Video (Windows Media WMV) + Filmato (Windows Media WMV) </label> </mimetype> <mimetype name="video/x-msvideo"> <label name="video/x-msvideo_label"> - Video (AVI) + Filmato (AVI) </label> </mimetype> </mimetypes> diff --git a/indra/newview/skins/default/xui/it/notifications.xml b/indra/newview/skins/default/xui/it/notifications.xml index ba68816f58..6736c6a6f1 100644 --- a/indra/newview/skins/default/xui/it/notifications.xml +++ b/indra/newview/skins/default/xui/it/notifications.xml @@ -44,10 +44,10 @@ <button name="Cancel_yesnocancelbuttons" text="$canceltext"/> </form> </template> - <notification functor="GenericAcknowledge" label="Messaggio di Notifica Sconosciuto" name="MissingAlert"> - La versione di [APP_NAME] non riesce a visualizzare la notifica che ha ricevuto. Verifica di avere l'ultima versione del Viewer installata. + <notification functor="GenericAcknowledge" label="Messaggio di notifica sconosciuto" name="MissingAlert"> + La versione di [APP_NAME] non riesce a visualizzare la notifica appena ricevuta. Verifica di avere l'ultima versione del Viewer installata. -Dettaglio Errore: La notifica di nome '[_NAME]' non è stata trovata in notifications.xml. +Dettagli errore: La notifica denominata '[_NAME]' non è stata trovata in notifications.xml. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="FloaterNotFound"> @@ -68,11 +68,11 @@ Dettaglio Errore: La notifica di nome '[_NAME]' non è stata trovata i <usetemplate name="okcancelbuttons" notext="Annulla" yestext="Si"/> </notification> <notification name="BadInstallation"> - Errore mentre si aggiornava [APP_NAME]. [http://get.secondlife.com Scarica l'ultima versione] del Viewer. + Il programma [APP_NAME] ha riscontrato un'errore durante il tentativo di aggiornamento. [http://get.secondlife.com Scarica l'ultima versione] del Viewer. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="LoginFailedNoNetwork"> - Non è possibile connettersi a [SECOND_LIFE_GRID]. + Non è possibile collegarsi alla [SECOND_LIFE_GRID]. '[DIAGNOSTIC]' Accertati che la tua connessione Internet stia funzionando correttamente. <usetemplate name="okbutton" yestext="OK"/> @@ -146,7 +146,7 @@ Vuoi concedere i diritti di modifica ai residenti selezionati? Non si possono rimuovere membri da quel ruolo. I membri devono dimettersi volontariamente dal ruolo. Confermi l'operazione? - <usetemplate ignoretext="Conferma prima di aggiungere un nuovo Proprietario del Gruppo" name="okcancelignore" notext="No" yestext="Si"/> + <usetemplate ignoretext="Conferma prima di aggiungere un nuovo proprietario del gruppo" name="okcancelignore" notext="No" yestext="Si"/> </notification> <notification name="AssignDangerousActionWarning"> Stai per aggiungere il potere '[ACTION_NAME]' al ruolo '[ROLE_NAME]'. @@ -186,10 +186,10 @@ Continuare? Non hai abbastanza L$ per iscriverti a questo gruppo. </notification> <notification name="CreateGroupCost"> - La Creazione di questo gruppo costerà L$100. -I Gruppi devono avere più di un membro, o saranno cancellati definitivamente. -Per favore invita altri membri entro le prossime 48 ore. - <usetemplate canceltext="Annulla" name="okcancelbuttons" notext="Cancella" yestext="Crea un gruppo per L$100"/> + La creazione di questo gruppo costerà L$ 100. +I gruppi devono avere più di un partecipante, o saranno eliminati definitivamente. +Invita altri partecipanti entro le prossime 48 ore. + <usetemplate canceltext="Annulla" name="okcancelbuttons" notext="Annulla" yestext="Crea un gruppo per L$ 100"/> </notification> <notification name="LandBuyPass"> Pagando [COST]L$ puoi entrare in questa terra ('[PARCEL_NAME]') per [TIME] ore. Compri un pass? @@ -205,10 +205,10 @@ Il tuo prezzo di vendità è [SALE_PRICE]L$ ed è autorizzato alla vendita a [NA <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/> </notification> <notification name="ConfirmLandSaleToAnyoneChange"> - ATTENZIONE: Cliccando 'vendi a tutti' rende questo terreno disponibile all'intera comunità [SECOND_LIFE], perfino a quelli che non sono in questa regione. + ATTENZIONE: Quando selezioni 'vendi a tutti', rendi questo terreno disponibile all'intera comunità di [SECOND_LIFE], anche alle persone che non si trovano in questa regione. -Stai mettendo in vendita il terrendo selezionato di [LAND_SIZE] m². -Il prezzo di vendità è [SALE_PRICE]L$ e verrà autorizzato alla vendita a [NAME]. +Il terrendo selezionato di [LAND_SIZE] m² sta per essere messo in vendita. +Il prezzo di vendità sarà [SALE_PRICE]L$ e [NAME] viene autorizzato alla vendita. <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/> </notification> <notification name="ReturnObjectsDeededToGroup"> @@ -269,10 +269,10 @@ L'intera regione ha l'abilitazione danni. Gli script devono essere autorizzati all'esecuzione affinchè le armi funzionino. </notification> <notification name="MultipleFacesSelected"> - Multiple facce multimediale sono attualmente selezionate. -Se prosegui con questa azione, esempi separati del media saranno impostati su facce multimediali dell'oggetto. ???!!! -Per impostare il media su una sola faccia multimediale, scegli Seleziona Faccia e clicca la faccia desiderata dell'oggetto e poi clicca Aggiungi. - <usetemplate ignoretext="Il Media sarà impostato su facce multimediali multiple" name="okcancelignore" notext="Cancella" yestext="OK"/> + Sono state selezionate più facce. +Se prosegui con questa azione, sulle diverse facce dell'oggetto verranno definite sessioni multimediali distinte. +Per collocare il media su una sola faccia, scegli Seleziona faccia, clicca su una faccia e clicca su Aggiungi. + <usetemplate ignoretext="Il canale multimediale sarà impostato su più facce selezionate" name="okcancelignore" notext="Annulla" yestext="OK"/> </notification> <notification name="MustBeInParcel"> Devi essere dentro il terreno per impostare il suo Punto di Atterraggio. @@ -310,8 +310,8 @@ La cartella equipaggiamento non contiene abbigliamento, parti del corpo o attach Non puoi indossare abiti e parti del corpo che sono nel cestino </notification> <notification name="MaxAttachmentsOnOutfit"> - L'oggetto non può essere attaccato. -Superato il limite di oggetti attaccati [MAX_ATTACHMENTS]. Per favore prima stacca un altro oggetto. + L'oggetto non può essere collegato. +Superato il limite di oggetti collegati [MAX_ATTACHMENTS]. Per favore prima stacca un altro oggetto. </notification> <notification name="CannotWearInfoNotComplete"> Non puoi indossare quell'elemento perchè non è ancora stato caricato. Riprova fra un minuto. @@ -327,11 +327,11 @@ Hai bisogno di un account per entrare in [SECOND_LIFE]. Ne vuoi creare uno adess <usetemplate name="okcancelbuttons" notext="Riprova" yestext="Crea un nuovo account"/> </notification> <notification name="AddClassified"> - L'inserzione apparirà nella sezione 'Annunci' della Ricerca e su [http://secondlife.com/community/classifieds secondlife.com] per una settimana. -Compila la tua inserzione, e quindi clicca 'Pubblica...' per aggiungerla all'elenco. -Ti sarà chiesto un prezzo da pagare quando clicchi Pubblica. -Pagando di più il tuo annuncio apparirà più in alto nella lista, e apparirà anche più in alto quando la gente cerca per Parole Chiavi. - <usetemplate ignoretext="Come Creare una nuova Inserzione" name="okcancelignore" notext="Annulla" yestext="OK"/> + L'inserzione comparirà nella sezione 'Annunci' della Ricerca e su [http://secondlife.com/community/classifieds secondlife.com] per una settimana. +Compila la tua inserzione, quindi clicca 'Pubblica...' per aggiungerla all'elenco degli annunci. +Quando clicchi su Pubblica, ti verrà chiesto di indicare quale prezzo vuoi pagare. +Pagando di più, il tuo annuncio comparirà più in alto nella lista delle inserzioni, nonché nei risultati delle ricerche in base a parole chiave. + <usetemplate ignoretext="Come creare una nuova inserzione" name="okcancelignore" notext="Annulla" yestext="OK"/> </notification> <notification name="DeleteClassified"> Cancella annuncio '[NAME]'? @@ -339,9 +339,9 @@ Non ci sono rimborsi per la tariffa pagata. <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/> </notification> <notification name="DeleteMedia"> - Hai selezionato la cancellazione del media associato a questa faccia multimediale. -Sei sicuro di voler continuare? - <usetemplate ignoretext="Confemra la cancellazione del multimedia dall'oggetto" name="okcancelignore" notext="No" yestext="Si"/> + Hai selezionato la cancellazione del media associato a questa faccia. +Vuoi continuare? + <usetemplate ignoretext="Conferma prima di eliminare elemnti multimediali dall'oggetto" name="okcancelignore" notext="No" yestext="Sì"/> </notification> <notification name="ClassifiedSave"> Salva le modifiche all'annuncio [NAME]? @@ -369,17 +369,17 @@ Sei sicuro di voler continuare? Scegli un item storico da vedere. </notification> <notification name="CacheWillClear"> - La Cache verrà cancellata dopo la ripartenza di [APP_NAME]. + La cache verrà cancellata dopo il riavvio di [APP_NAME]. </notification> <notification name="CacheWillBeMoved"> - La Cache verrà mossa dopo la ripartenza di [APP_NAME]. -Nota: Questo cancellerà anche la cache. + La cache verrà spostata dopo il riavvio di [APP_NAME]. +Nota: questa operazione cancellerà la cache. </notification> <notification name="ChangeConnectionPort"> - Le importazioni di Porte avranno effetto dopo la ripartenza di [APP_NAME]. + Le impostazioni della porta avranno effetto dopo il riavvio di [APP_NAME]. </notification> <notification name="ChangeSkin"> - La nuova skin apparirà dopo la ripartenza di [APP_NAME]. + La nuova pelle comparirà dopo il riavvio di [APP_NAME]. </notification> <notification name="GoToAuctionPage"> Vai alla pagina web [SECOND_LIFE] per vedere i dettagli dell'asta oppure fai un'offerta? @@ -428,8 +428,8 @@ L'oggetto potrebbe essere troppo lontano oppure essere stato cancellato. C'è stato un problema salvando lo script compilato a causa del seguente motivo: [REASON]. Riprova a salvare lo script più tardi. </notification> <notification name="StartRegionEmpty"> - Oops, la tua Regione di Inizio non è stata impostata. -Per favore scrivi il nome della Regione nello spazio Regione di Inizio oppure scegli la mia ultima Ubicazione o Casa Mia come ultima ubicazione. + La tua Regione di inizio non è stata definita. +Per scegliere il luogo dove vuoi trovarti all'accesso, digita il nome della regione nel campo del luogo di partenza oppure scegli La mia ultima Ubicazione o Casa mia. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CouldNotStartStopScript"> @@ -449,21 +449,21 @@ Visitare [_URL] per ulteriori informazioni? <url name="url" option="0"> http://secondlife.com/support/sysreqs.php?lang=it </url> - <usetemplate ignoretext="L'hardware di questo computer non è supportato" name="okcancelignore" notext="No" yestext="Si"/> + <usetemplate ignoretext="L'hardware di questo computer non è compatibile" name="okcancelignore" notext="No" yestext="Si"/> </notification> <notification name="UnknownGPU"> Il tuo sistema utilizza una scheda grafica che [APP_NAME] non riconosce. Questo succede spesso con un nuovo hardware che non è stato ancora testato con [APP_NAME]. Probabilmente tutto andrà bene, ma devi riconfigurare le tue impostazioni grafiche. (Io > Preferenze > Grafica). <form name="form"> - <ignore name="ignore" text="La mia scheda grafica non è stata identificata"/> + <ignore name="ignore" text="La tua scheda grafica non è stata riconosciuta"/> </form> </notification> <notification name="DisplaySettingsNoShaders"> - [APP_NAME] si è interrotta mentre stava inizializzando i driver grafici. -La Qualità Grafica verrà impostata a Basso per evitare alcuni errori comuni di driver. Questo disabiliterà alcune caratteristiche grafiche. -Si raccomanda di aggiornare i driver della scheda grafica. -La Qualità Grafica può essere aumentata in Preferenze > Grafica. + L'esecuzione di [APP_NAME] si è interrotta durante l'inizializzazione dei driver grafici. +La qualità grafica verrà impostata a livello basso per evitare alcuni errori comuni di driver. Alcune funzionalità grafiche saranno disattivate. +Si consiglia di aggiornare i driver della scheda grafica. +La qualità grafica può essere aumentata in Preferenze > Grafica. </notification> <notification name="RegionNoTerraforming"> La regione [REGION] non consente di terraformare. @@ -618,7 +618,7 @@ Attese [VALIDS] Impossibile creare il file in uscita: [FILE] </notification> <notification name="DoNotSupportBulkAnimationUpload"> - [APP_NAME] non supporta ancora l'upload in blocco di file di animazione. + [APP_NAME] non supporta ancora il caricamento in blocco di file di animazione. </notification> <notification name="CannotUploadReason"> Impossibile importare il file [FILE] a causa del seguente motivo: [REASON] @@ -654,7 +654,7 @@ Seleziona oggetti con degli script. Seleziona oggetti con script su cui hai i permessi di modifica. </notification> <notification name="CannotOpenScriptObjectNoMod"> - Impossibile aprire la script dell'oggetto senza i permessi modify. + Impossibile aprire la script dell'oggetto senza i diritti di modifica. </notification> <notification name="CannotSetRunningSelectObjectsNoScripts"> Impossibile mettere 'in esecuzione' gli script. @@ -683,12 +683,12 @@ Ho cercato: [FINALQUERY] [REASON] </notification> <notification name="invalid_tport"> - E' stato incontrato un problema eseguendo la tua richiesta di teleport. Potresti avere bisogno di riloggarti per ritentare il teleport. -Se continui a ricevere questo errore, controlla [SUPPORT_SITE]. + C'è stato un problema nell'elaborare la tua richiesta di teleport. Potresti dover effettuare nuovamente l'accesso prima di poter usare il teleport. +Se si continua a visualizzare questo messaggio, consulta la pagina [SUPPORT_SITE]. </notification> <notification name="invalid_region_handoff"> - Ci sono stati problemi eseguendo il passaggio di regione. Potresti avere bisogno di riloggarti per ritentare il passaggio di regione. -Se continui a ricevere questo errore, controlla [SUPPORT_SITE]. + Si è verificato un problema nel tentativo di attraversare regioni. È possibile che per potere attraversare le regioni, tu debba effettuare nuovamente l'accesso. +Se si continua a visualizzare questo messaggio, consulta la pagina [SUPPORT_SITE]. </notification> <notification name="blocked_tport"> Spiacenti, il teletrasporto è bloccato al momento. Prova di nuovo tra pochi istanti. Se ancora non potrai teletrasportarti, per favore scollegati e ricollegati per risolvere il problema. @@ -757,7 +757,7 @@ Nessun terreno selezionato. Non riesco a trovare la regione dove è situato il terreno. </notification> <notification name="CannotCloseFloaterBuyLand"> - Non puoi chiudere la finestra di Acquisto Terreno finchè [APP_NAME] non finisce di stimare il prezzo di questa transazione. + Non puoi chiudere la finestra Acquista terreno finché [APP_NAME] non finisce di stimare il prezzo di questa transazione. </notification> <notification name="CannotDeedLandNothingSelected"> Impossibile cedere il terreno: @@ -768,8 +768,8 @@ Nessun terreno selezionato. Nessun gruppo selezionato. </notification> <notification name="CannotDeedLandNoRegion"> - Non è possibile donare il terreno: -Non riesco a trovare la regione in cui si trova. + Non è possibile effettuare la cessione del terreno: +Impossibile trovare la regione in cui si trova il terreno. </notification> <notification name="CannotDeedLandMultipleSelected"> Impossibile cedere il terreno: @@ -806,7 +806,7 @@ I terreni di tua proprietà vengono visualizzati in verde. </notification> <notification name="CannotReleaseLandRegionNotFound"> Non è possibile abbandonare il terreno: -Non riesco a trovare la regione in cui si trova. +Impossibile trovare la regione in cui si trova il terreno. </notification> <notification name="CannotReleaseLandNoTransfer"> Impossibile abbandonare il terreno: @@ -844,11 +844,11 @@ Dividi il terreno? </notification> <notification name="CannotDivideLandNoRegion"> Non è possibile suddividere il terreno: -Non riesco a trovare la regione in cui si trova. +Impossibile trovare la regione in cui si trova il terreno. </notification> <notification name="CannotJoinLandNoRegion"> Non è possibile unire il terreno: -Non riesco a trovare la regione in cui si trova. +Impossibile trovare la regione in cui si trova il terreno. </notification> <notification name="CannotJoinLandNothingSelected"> Impossibile unire il terreno: @@ -895,7 +895,7 @@ Unisci il terreno? </notification> <notification name="CannotSaveToAssetStore"> Non è possibile salvare [NAME] nel database centrale degli asset. -Questo normalmente è un problema temporaneo. Riadatta e salva i vestiti e riprova fra qualche minuto. +In genere si tratta di un problema temporaneo. Attendi alcuni minuti per modificare e salvare nuovamente gli elementi indossabili. </notification> <notification name="YouHaveBeenLoggedOut"> Accidenti. Sei stato scollegato da [SECOND_LIFE] @@ -1060,35 +1060,36 @@ Cedi questo terreno di [AREA] m² al gruppo '[GROUP_NAME]'? <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AvatarMovedDesired"> - L'ubicazione desiderata non è attualmente disponibile. Sei stato trasportato in una regione vicina. + L'ubicazione prescelta non è attualmente disponibile. +Sei stato trasferito in una regione vicina. </notification> <notification name="AvatarMovedLast"> - La tua ultima ubicazione non è al momento disponibile. -Sei stato trasferito in una regione vicina . + La tua ultima posizione non è al momento disponibile. +Sei stato trasferito in una regione vicina. </notification> <notification name="AvatarMovedHome"> L'ubicazione di casa tua non è al momento disponibile. -Sei stato trasferito in un'ubicazione vicina. -Potresti impostare una nuova ubicazione. +Sei stato trasferito in una regione vicina. +Ti consigliamo di impostare una nuova posizione iniziale. </notification> <notification name="ClothingLoading"> - Sto ancora scaricando i tuoi abiti. -Puoi comunque usare [SECOND_LIFE] normalmente e gli altri ti vedranno correttamente. + Gli abiti sono in corso di scaricamento. +Puoi comunque usare [SECOND_LIFE] normalmente e gli altri residenti ti vedranno correttamente. <form name="form"> - <ignore name="ignore" text="Lo scarico degli abiti sta impiegando parecchio tempo"/> + <ignore name="ignore" text="Lo scaricamento sta richiedendo parecchio tempo"/> </form> </notification> <notification name="FirstRun"> - L'installazione di [APP_NAME] è completa. + L'installazione di [APP_NAME] è terminata. -Se questa è la prima volta che usi [SECOND_LIFE], devi creare un account prima che tu possa fare il log in. -Vuoi ritornare su [http://join.secondlife.com secondlife.com] per creare un nuovo account? +Se questa è la prima volta che usi [SECOND_LIFE], devi creare un account prima che tu possa effettuare l'accesso. +Vuoi tornare a [http://join.secondlife.com secondlife.com] per creare un nuovo account? <usetemplate name="okcancelbuttons" notext="Continua" yestext="Nuovo Account..."/> </notification> <notification name="LoginPacketNeverReceived"> - Ci sono problemi di connessione. Può darsi che siano nella tua connessione Internet oppure in [SECOND_LIFE_GRID]. + Ci sono problemi di connessione. È possibile che ci siano problemi con la tua connessione Internet oppure sulla [SECOND_LIFE_GRID]. -Puoi controllare la tua connessione Internet e riprovare fra qualche minuto, oppure cliccare Aiuto per vedere il [SUPPORT_SITE], oppure cliccare Teleport per tentare di teleportarti a casa. +Controlla la tua connessione Internet e riprova fra qualche minuto, oppure clicca su Aiuto per visualizzare la pagina [SUPPORT_SITE], oppure clicca su Teleport per tentare il teleport a casa tua. <url name="url"> http://it.secondlife.com/support/ </url> @@ -1110,10 +1111,10 @@ Scegli un avatar maschile o femminile. Puoi sempre cambiare idea più tardi. [NAME] [PRICE]L$ Non hai abbastanza L$ per farlo. </notification> <notification name="GrantedModifyRights"> - [NAME] ti ha dato il permesso di editare i suoi oggetti. + [NAME] ti ha dato il permesso di modificare i suoi oggetti. </notification> <notification name="RevokedModifyRights"> - Ti è stato revocato il permesso di modificare gli oggetti di [NAME] + Non sei più autorizzato a modificare gli oggetti di [NAME] </notification> <notification name="FlushMapVisibilityCaches"> Questo reinizializzerà la cache della mappa di questa regione. @@ -1192,107 +1193,107 @@ Imposta l'oggetto per la vendita e riprova. [DOWNLOAD_PATH]. </notification> <notification name="DownloadWindowsMandatory"> - E' disponibile una nuova versione di [APP_NAME]. + È disponibile una nuova versione di [APP_NAME]. [MESSAGE] -Devi scaricarla per usare [APP_NAME]. +Devi scaricare questo aggiornamento per utilizzare [APP_NAME]. <usetemplate name="okcancelbuttons" notext="Esci" yestext="Scarica l'aggiornamento"/> </notification> <notification name="DownloadWindows"> - E' disponibile una versione aggiornata di [APP_NAME]. + È disponibile una versione aggiornata di [APP_NAME]. [MESSAGE] -Questo aggiornamento non è obbligatorio, ma è consigliabile installarlo per migliorare le prestazioni e la stabilità. +Questo aggiornamento non è necessario, ma ti consigliamo di installarlo per migliorare il rendimento e la stabilità. <usetemplate name="okcancelbuttons" notext="Continua" yestext="Scarica l'aggiornamento"/> </notification> <notification name="DownloadWindowsReleaseForDownload"> - E' disponibile una versione aggiornata di [APP_NAME]. + È disponibile una versione aggiornata di [APP_NAME]. [MESSAGE] -Questo aggiornamento non è obbligatorio, ma è consigliabile installarlo per migliorare le prestazioni e la stabilità. +Questo aggiornamento non è necessario, ma ti consigliamo di installarlo per migliorare il rendimento e la stabilità. <usetemplate name="okcancelbuttons" notext="Continua" yestext="Scarica l'aggiornamento"/> </notification> <notification name="DownloadLinuxMandatory"> - Una nuova versione di [APP_NAME] è disponibile. + È disponibile una nuova versione di [APP_NAME]. [MESSAGE] -Devi scaricare questo aggiornamento per utilizzarlo [APP_NAME]. - <usetemplate name="okcancelbuttons" notext="Esci" yestext="Download"/> +Devi scaricare questo aggiornamento per utilizzare [APP_NAME]. + <usetemplate name="okcancelbuttons" notext="Esci" yestext="Scarica"/> </notification> <notification name="DownloadLinux"> - E' disponibile una versione aggiornata di [APP_NAME]. + È disponibile una versione aggiornata di [APP_NAME]. [MESSAGE] -Questo aggiornamento non è necessario, ti consigliamo di installarlo per migliorare il rendimento e la stabilità. - <usetemplate name="okcancelbuttons" notext="Continua" yestext="Download"/> +Questo aggiornamento non è necessario, ma ti consigliamo di installarlo per migliorare il rendimento e la stabilità. + <usetemplate name="okcancelbuttons" notext="Continua" yestext="Scarica"/> </notification> <notification name="DownloadLinuxReleaseForDownload"> - E' disponibile una versione aggiornata di [APP_NAME]. + È disponibile una versione aggiornata di [APP_NAME]. [MESSAGE] -Questo aggiornamento non è obbligatorio, ma è consigliata l'installazione per migliorare le prestazioni e l'affidabilità. - <usetemplate name="okcancelbuttons" notext="Continua" yestext="Download"/> +Questo aggiornamento non è necessario, ma ti consigliamo di installarlo per migliorare il rendimento e la stabilità. + <usetemplate name="okcancelbuttons" notext="Continua" yestext="Scarica"/> </notification> <notification name="DownloadMacMandatory"> - E' disponibile una nuova versione di [APP_NAME]. + È disponibile una nuova versione di [APP_NAME]. [MESSAGE] -Devi scaricarla per usare [APP_NAME]. +Devi scaricare questo aggiornamento per utilizzare [APP_NAME]. -Scarico nella cartella Applicazioni? +Scaricare nella cartella Applicazioni? <usetemplate name="okcancelbuttons" notext="Esci" yestext="Scarica l'aggiornamento"/> </notification> <notification name="DownloadMac"> - E' disponibile una versione aggiornata di [APP_NAME]. + È disponibile una versione aggiornata di [APP_NAME]. [MESSAGE] -Questo aggiornamento non è obbligatorio, ma è consigliabile installarlo per migliorare le prestazioni e la stabilità. +Questo aggiornamento non è necessario, ma ti consigliamo di installarlo per migliorare il rendimento e la stabilità. -Scarico nella cartella Applicazioni? +Scaricare nella cartella Applicazioni? <usetemplate name="okcancelbuttons" notext="Continua" yestext="Scarica l'aggiornamento"/> </notification> <notification name="DownloadMacReleaseForDownload"> - E' disponibile una versione aggiornata di [APP_NAME]. + È disponibile una versione aggiornata di [APP_NAME]. [MESSAGE] -Questo aggiornamento non è obbligatorio, ma è consigliabile installarlo per migliorare le prestazioni e la stabilità. +Questo aggiornamento non è necessario, ma ti consigliamo di installarlo per migliorare il rendimento e la stabilità. -Scarico nella cartella Applicazioni? +Scaricare nella cartella Applicazioni? <usetemplate name="okcancelbuttons" notext="Continua" yestext="Scarica l'aggiornamento"/> </notification> <notification name="DeedObjectToGroup"> La cessione di questo oggetto farà in modo che il gruppo: * Riceva i L$ pagati all'oggetto - <usetemplate ignoretext="Conferma la donazione di un oggetto al gruppo" name="okcancelignore" notext="Annulla" yestext="Cedi"/> + <usetemplate ignoretext="Conferma la cessione di un oggetto al gruppo" name="okcancelignore" notext="Annulla" yestext="Cedi"/> </notification> <notification name="WebLaunchExternalTarget"> - Vuoi aprire il browser per vedere questo contenuto? - <usetemplate ignoretext="Lancia il browser per vedere la pagina web" name="okcancelignore" notext="Annulla" yestext="OK"/> + Vuoi aprire il browser per vedere questi contenuti? + <usetemplate ignoretext="Lancia il browser per consultare una pagina web" name="okcancelignore" notext="Annulla" yestext="OK"/> </notification> <notification name="WebLaunchJoinNow"> Vuoi andare su [http://secondlife.com/account/ Dashboard] per gestire il tuo account? - <usetemplate ignoretext="Lancia il browser pe gestire il mio account" name="okcancelignore" notext="Annulla" yestext="OK"/> + <usetemplate ignoretext="Lancia il browser per gestire il mio account" name="okcancelignore" notext="Annulla" yestext="OK"/> </notification> <notification name="WebLaunchSecurityIssues"> Visita la Wiki di [SECOND_LIFE] per i dettagli su come segnalare un problema di sicurezza. - <usetemplate ignoretext="Lancia il browser per imparare a segnalare un Problema di Sicurezza" name="okcancelignore" notext="Annulla" yestext="OK"/> + <usetemplate ignoretext="Lancia il browser per imparare a segnalare un problema di sicurezza" name="okcancelignore" notext="Annulla" yestext="OK"/> </notification> <notification name="WebLaunchQAWiki"> Visita il controllo di qualità Wiki [SECOND_LIFE]. - <usetemplate ignoretext="Lancia il browser per vedere il QA Wiki" name="okcancelignore" notext="Annulla" yestext="OK"/> + <usetemplate ignoretext="Lancia il browser per vedere la pagina Wiki sul controllo di qualità" name="okcancelignore" notext="Annulla" yestext="OK"/> </notification> <notification name="WebLaunchPublicIssue"> Visita il registro pubblico dei problemi di [SECOND_LIFE], dove puoi segnalare bug ed altri problemi. - <usetemplate ignoretext="Lancia il browser per vedere il Registro dei Problemi Pubblici" name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/> + <usetemplate ignoretext="Lancia il browser per vedere il registro pubblico di monitoraggio dei problemi" name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/> </notification> <notification name="WebLaunchSupportWiki"> Vai al blog ufficiale Linden, per le ultime notizie ed informazioni. <usetemplate ignoretext="Lancia il browser per vedere il blog" name="okcancelignore" notext="Annulla" yestext="OK"/> </notification> <notification name="WebLaunchLSLGuide"> - Vuoi aprire la Guida per lo Scripting per avere aiuto con lo scripting? - <usetemplate ignoretext="Lancia il browser per vedere la Guida per lo Scripting" name="okcancelignore" notext="Annulla" yestext="OK"/> + Vuoi aprire la Guida per lo scripting per avere aiuto con lo scripting? + <usetemplate ignoretext="Lancia il browser per vedere la Guida per lo scripting" name="okcancelignore" notext="Annulla" yestext="OK"/> </notification> <notification name="WebLaunchLSLWiki"> - Vuoi visitare il Portale LSL per avere aiuto con lo Scripting? + Vuoi visitare il Portale LSL per avere aiuto con lo scripting? <usetemplate ignoretext="Lancia il browser per vedere il Portale LSL" name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/> </notification> <notification name="ReturnToOwner"> Confermi di voler restituire gli oggetti selezionati ai loro proprietari? Gli oggetti trasferibili ceduti al gruppo, verranno restituiti ai proprietari precedenti. *ATTENZIONE* Gli oggetti ceduti non trasferibili verranno cancellati! - <usetemplate ignoretext="Conferma la restituzione degli oggetti ai loro proprietari" name="okcancelignore" notext="Annulla" yestext="OK"/> + <usetemplate ignoretext="Conferma prima di restituire gli oggetti ai relativi proprietari" name="okcancelignore" notext="Annulla" yestext="OK"/> </notification> <notification name="GroupLeaveConfirmMember"> Sei attualmente un membro del gruppo [GROUP]. @@ -1304,14 +1305,14 @@ Vuoi lasciare il gruppo? <usetemplate name="okcancelbuttons" notext="Annulla" yestext="Espelli tutti i residenti"/> </notification> <notification name="MuteLinden"> - Mi dispiace, non puoi bloccare un Linden. + Spiacenti, non puoi bloccare un Linden. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CannotStartAuctionAlreadyForSale"> Non è possibile mettere in vendita all'asta un terreno che è già impostato per la vendita. Disabilita la vendita del terreno, se sei certo di voler avviare una vendita all'asta. </notification> - <notification label="E' fallito Il Blocco dell'Oggetto" name="MuteByNameFailed"> - Hai già bloccato questo nome. + <notification label="Il blocco dell'oggetto in base al nome non è riuscito," name="MuteByNameFailed"> + hai già bloccato questo nome. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="RemoveItemWarn"> @@ -1328,9 +1329,9 @@ Vuoi cancellare quell'elemento? <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="BusyModeSet"> - E' stata impostata la modalità Non Disponibile. -La Chat e gli IM verranno nascosti. Gli IM riceveranno la tua risposta di Non Disponibile. Tutte le offerte di teleport verranno declinate. Tutte le offerte di Inventory andranno nel Cestino. - <usetemplate ignoretext="Cambio il mio stato in Non Disponibile" name="okignore" yestext="OK"/> + È stata impostata la modalità Non disponibile. +La chat e gli IM verranno nascosti. Gli IM riceveranno la tua risposta di Non disponibile. Tutte le offerte di teleport verranno rifiutate. Tutte le offerte di Inventario andranno nel Cestino. + <usetemplate ignoretext="Cambio il mio stato sulla modalità Non disponibile" name="okignore" yestext="OK"/> </notification> <notification name="JoinedTooManyGroupsMember"> Hai raggiunto il numero massimo di gruppi. Per favore abbandona almeno un gruppo prima di aderire a questo, oppure declina l'offerta. @@ -1403,15 +1404,15 @@ La Chat e gli IM verranno nascosti. Gli IM riceveranno la tua risposta di Non Di </notification> <notification name="TeleportFromLandmark"> Sei sicuro di volere il teleport a <nolink>[LOCATION]</nolink>? - <usetemplate ignoretext="Conferma il teleport verso un Landmark" name="okcancelignore" notext="Annulla" yestext="Teleportati"/> + <usetemplate ignoretext="Conferma il teleport verso un punto di riferimento" name="okcancelignore" notext="Annulla" yestext="Teleportati"/> </notification> <notification name="TeleportToPick"> Teleport a [PICK]? - <usetemplate ignoretext="Conferma il teleport verso l'ubicazione nei Posti Consigliati" name="okcancelignore" notext="Annulla" yestext="Teleport"/> + <usetemplate ignoretext="Conferma che voglio il teleport verso l'ubicazione nei Luoghi preferiti" name="okcancelignore" notext="Annulla" yestext="Teleport"/> </notification> <notification name="TeleportToClassified"> Teleport a [CLASSIFIED]? - <usetemplate ignoretext="Confermo il teleport verso questa ubicazione negli Annunci" name="okcancelignore" notext="Cancella" yestext="Teleport"/> + <usetemplate ignoretext="Conferma il teleport verso questa posizione negli annunci" name="okcancelignore" notext="Annulla" yestext="Teleport"/> </notification> <notification label="Manda un messaggio a tutti nella tua proprietà" name="MessageEstate"> Scrivi un annuncio breve che verrà mandato a tutti quelli che sono in questo momento nella tua proprietà. @@ -1489,19 +1490,19 @@ Vuoi andare alla Knowledge Base per ulteriori informazioni sulle categorie di ac <url name="url"> http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/it </url> - <usetemplate ignoretext="Non posso entrare in questa Regione, a causa delle restrizioni sulla Categoria di Accesso" name="okcancelignore" notext="Chiudi" yestext="Vai alla Knowledge Base"/> + <usetemplate ignoretext="Non posso entrare in questa regione a causa delle restrizioni della categoria di accesso" name="okcancelignore" notext="Chiudi" yestext="Vai alla Knowledge Base"/> </notification> <notification name="RegionEntryAccessBlocked_Notify"> Non sei ammesso in questa regione a causa della tua categoria d'accesso. </notification> <notification name="RegionEntryAccessBlocked_Change"> - Non ti è consentito entrare in quella Regione a causa della tua Categoria di Accesso impostata nelle Preferenze. + Non ti è consentito entrare in quella regione a causa della tua categoria di accesso impostata nelle preferenze. -Puoi cliccare su 'Cambia Preferenze' per alzare la tua preferenza di Categoria di Accesso e quindi riuscire ad entrare. Sarai in grado di ricercare e di accedere da adesso in poi contenuto [REGIONMATURITY]. Se più tardi volessi cambiare di nuovo le tue impostazioni, vai su Me > Preferenze > Generali. +Puoi cliccare su Cambia preferenze per modificare la categoria di accesso e quindi riuscire ad entrare. Da adesso potrai accedere ai contenuti [REGIONMATURITY] ed effettuare ricerche in questa categoria. Se in seguito tu volessi cambiare di nuovo le tue impostazioni, apri la finestra di dialogo da Io > Preferenze > Generale. <form name="form"> - <button name="OK" text="Cambia Preferenza"/> + <button name="OK" text="Cambia preferenza"/> <button default="true" name="Cancel" text="Chiudi"/> - <ignore name="ignore" text="Le mie preferenze attivate nel Rating (Classificazione) prevengono il mio ingresso in una Regione"/> + <ignore name="ignore" text="La categoria di accesso impostata mi impedisce di entrare in una regione"/> </form> </notification> <notification name="LandClaimAccessBlocked"> @@ -1517,16 +1518,16 @@ Vuoi andare alla Knowledge Base per maggiori informazioni sulle categorie di acc <url name="url"> http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/it </url> - <usetemplate ignoretext="Non posso richiedere questo Terreno, a causa delle restrizioni sulla Categoria di Accesso" name="okcancelignore" notext="Chiudi" yestext="Vai alla Knowledge Base"/> + <usetemplate ignoretext="Non posso richiedere questo terreno a causa delle restrizioni della categoria di accesso" name="okcancelignore" notext="Chiudi" yestext="Vai alla Knowledge Base"/> </notification> <notification name="LandClaimAccessBlocked_Notify"> Non puoi prendere possesso di questa terra a causa della tua categoria di accesso. </notification> <notification name="LandClaimAccessBlocked_Change"> - Non puoi richiedere questo Terreno a causa delle tue preferenze di Categoria di Accesso. + Non puoi richiedere questo terreno a causa della tua categoria di accesso. -Puoi cliccare su 'Cambia Preferenze' per alzare la tua preferenza di Categoria di Accesso e quindi riuscire ad entrare. Sarai in grado di ricercare e di accedere da adesso in poi contenuto [REGIONMATURITY]. Se più tardi volessi cambiare di nuovo le tue impostazioni, vai su Me > Preferenze > Generali. - <usetemplate ignoretext="Le mie preferenze di Categoria di Accesso mi impediscono di chiedere questo Terreno" name="okcancelignore" notext="Chiudi" yestext="Cambia le preferenze"/> +Puoi cliccare su Cambia preferenze per modificare la categoria di accesso e quindi riuscire ad entrare. Da adesso potrai accedere ai contenuti [REGIONMATURITY] ed effettuare ricerche in questa categoria. Se in seguito tu volessi cambiare di nuovo le tue impostazioni, apri la finestra di dialogo da Io > Preferenze > Generale. + <usetemplate ignoretext="Le mie preferenze di categoria di accesso mi impediscono di richiedere terreno" name="okcancelignore" notext="Chiudi" yestext="Cambia le preferenze"/> </notification> <notification name="LandBuyAccessBlocked"> Non puoi acquistare questo terreno a causa della tua categoria di accesso. Questo può essere dovuto ad una mancanza di informazioni valide che confermino la tua età. @@ -1541,16 +1542,16 @@ Vuoi andare alla Knowledge Base per maggiori informazioni sulle categorie di acc <url name="url"> http://wiki.secondlife.com/wiki/Linden_Lab_Official:Maturity_ratings:_an_overview/it </url> - <usetemplate ignoretext="Non posso comprare questo Terreno , a causa delle restrizioni della Categoria di Accesso" name="okcancelignore" notext="Chiudi" yestext="Vai alla Knowledge Base"/> + <usetemplate ignoretext="Non posso acquistare questo terreno a causa delle restrizioni della categoria di accesso" name="okcancelignore" notext="Chiudi" yestext="Vai alla Knowledge Base"/> </notification> <notification name="LandBuyAccessBlocked_Notify"> Non puoi acquistare questa land a causa della tua categoria di accesso. </notification> <notification name="LandBuyAccessBlocked_Change"> - Non puoi comprare questo Terreno a causa delle tue preferenze di Categoria di Accesso. + Non puoi acquistare questo terreno a causa della tua categoria di accesso. -Puoi cliccare su 'Cambia Preferenze' per alzare la tua preferenza di Categoria di Accesso e quindi riuscire ad entrare. Sarai in grado di ricercare e di accedere da adesso in poi contenuto [REGIONMATURITY]. Se più tardi volessi cambiare di nuovo le tue impostazioni, vai su Me > Preferenze > Generali. - <usetemplate ignoretext="Le mie Preferenze di Accesso mi impediscono l'acquisto di questo Terreno" name="okcancelignore" notext="Chiudi" yestext="Cambia le preferenze"/> +Puoi cliccare su Cambia preferenze per modificare la categoria di accesso e quindi riuscire ad entrare. Da adesso potrai accedere ai contenuti [REGIONMATURITY] ed effettuare ricerche in questa categoria. Se in seguito tu volessi cambiare di nuovo le tue impostazioni, apri la finestra di dialogo da Io > Preferenze > Generale. + <usetemplate ignoretext="Le mie Preferenze di accesso mi impediscono di acquistare terreno" name="okcancelignore" notext="Chiudi" yestext="Cambia le preferenze"/> </notification> <notification name="TooManyPrimsSelected"> Hai selezionato troppi prim. Seleziona non più di [MAX_PRIM_COUNT] prim e riprova @@ -1611,7 +1612,7 @@ Un periodo di tempo è necessario prima che la modifica venga integrata nella ma Per accedere a regioni per adulti, i residenti devono avere un Account verificato, mediante verifica dell'età oppure mediante verifica della modalità di pagamento. </notification> <notification label="Versione voice non compatibile" name="VoiceVersionMismatch"> - Questa versione di [APP_NAME] non è compatibile con le capacità di Chat Voice in questa regione. Per poter far funzionare correttamente la Chat Voice devi aggiornare [APP_NAME]. + Questa versione di [APP_NAME] non è compatibile con la funzionalità di chat vocale in questa regione. Affinché la chat vocale funzioni correttamente, dovrai aggiornare [APP_NAME]. </notification> <notification label="Impossibile comprare oggetti" name="BuyObjectOneOwner"> Impossibile comprare oggetti da proprietari diversi nello stesso momento. @@ -1700,31 +1701,31 @@ Hai aggiornato l'ubicazione di questo preferito ma gli altri dettagli conse Questi elementi verranno trasferiti nel tuo inventario, ma non copiati. Trasferisci gli elementi nell'inventario? - <usetemplate ignoretext="Avvertimi quando rimuovo gli elementi 'no-copy' da un oggetto" name="okcancelignore" notext="Annulla" yestext="OK"/> + <usetemplate ignoretext="Avvertimi quando tento di rimuovore elementi per i quali non è consentita la copia da un oggetto" name="okcancelignore" notext="Annulla" yestext="OK"/> </notification> <notification name="MoveInventoryFromScriptedObject"> Hai selezionato elementi dell'inventario non copiabili. Questi elementi verranno trasferiti nel tuo inventario, non verranno copiati. Dato che questo oggetto è scriptato, il trasferimento di questi elementi nel tuo inventario potrebbe causare un malfunzionamento degli script. Trasferisci gli elementi nell'inventario? - <usetemplate ignoretext="Avvertimi se la rimozione di elementi 'no-copy' possono danneggiare un oggetto scriptato" name="okcancelignore" notext="Annulla" yestext="OK"/> + <usetemplate ignoretext="Avvertimi se tento di rimuovore di elementi per i quali non è consentita la copia e che potrebbero danneggiare un oggetto scriptato" name="okcancelignore" notext="Annulla" yestext="OK"/> </notification> <notification name="ClickActionNotPayable"> - Attenzione: E' stata impostata l'azione 'Paga Oggetto', ma funzionerà soltanto se inserisci uno script con un evento money(). + Attenzione: l'azione Paga oggetto è stata impostata, ma funzionerà soltanto se inserisci uno script con un evento money(). <form name="form"> - <ignore name="ignore" text="Ho impostato l'azione 'Paga Oggetto' costruendo un oggetto senza uno script money()"/> + <ignore name="ignore" text="Ho impostato l'azione Paga oggetto costruendo un oggetto senza uno script money()"/> </form> </notification> <notification name="OpenObjectCannotCopy"> Non ci sono elementi in questo oggetto che tu possa copiare. </notification> <notification name="WebLaunchAccountHistory"> - Vai su [http://secondlife.com/account/ Dashboard] per vedere la storia delle tue Transazioni? - <usetemplate ignoretext="Lancia il browser per vedere la storia del mio account" name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/> + Vai al [http://secondlife.com/account/ Dashboard] per vedere la cronologia del tuo account? + <usetemplate ignoretext="Lancia il browser per vedere la cronologia del mio account" name="okcancelignore" notext="Annulla" yestext="Vai alla pagina"/> </notification> <notification name="ConfirmQuit"> Confermi di voler uscire? - <usetemplate ignoretext="Conferma Uscita" name="okcancelignore" notext="Non Uscire" yestext="Esci"/> + <usetemplate ignoretext="Conferma prima di uscire" name="okcancelignore" notext="Non uscire" yestext="Esci"/> </notification> <notification name="HelpReportAbuseEmailLL"> Usa questo strumento per segnalare violazioni a [http://secondlife.com/corporate/tos.php Terms of Service] e [http://secondlife.com/corporate/cs.php Community Standards]. @@ -1753,15 +1754,15 @@ Devi essere il più specifico possibile, includendo i nomi e i dettagli dell&apo Inserendo una descrizione accurata ci aiuti a gestire ed elaborare le segnalazioni di abuso. </notification> <notification name="HelpReportAbuseContainsCopyright"> - Gentile Residente, + Gentile residente, -Sembra che tu stia segnalando una violazione di proprietà intellettuale. Cerca di essere sicuro che la tua segnalazione stia riportando correttamente: +Ci risulta che tu stia segnalando una violazione di proprietà intellettuale. Per segnalare correttamente la violazione: -(1) Il processo di Abuso. Puoi inviare una segnalazione di abuso se ritieni che un residente stia sfruttando il sistema di permessi di [SECOND_LIFE], per esempio usando CopyBot o simili strumenti di copia, per rubare i diritti della proprietà intellettuale. L'Ufficio Abusi investigherà e deciderà adeguate azioni disciplinari per comportamenti che violano i [http://secondlife.com/corporate/tos.php Termini di Servizio] di [SECOND_LIFE] oppure i [http://secondlife.com/corporate/cs.php Standard di Comunità]. Si tenga però presente che l'ufficio Abusi non gestisce e non risponde alle richieste di rimozione di contentuo da [SECOND_LIFE]. +(1) Definizione di abuso. Puoi inviare una segnalazione di abuso se ritieni che un residente stia sfruttando il sistema di permessi di [SECOND_LIFE], per esempio usando CopyBot o simili strumenti di copia, per rubare i diritti di proprietà intellettuale. L'Ufficio abusi investigherà e deciderà adeguate azioni disciplinari per comportamenti che violano i [http://secondlife.com/corporate/tos.php Termini del servizio] di [SECOND_LIFE] oppure gli [http://secondlife.com/corporate/cs.php Standard della comunità]. Tieni comunque presente che l'Ufficio abusi non gestisce e non risponde alle richieste di rimozione di contenuti da [SECOND_LIFE]. -(2) Il processo di rimozione DMCA o processo di rimozione dei contenuti. Per richiedere la rimozione di contenuto da [SECOND_LIFE], DEVI compilare una denuncia valid di furto come definito nella nostra [http://secondlife.com/corporate/dmca.php Policy DMCA]. +(2) DMCA o rimozione di contenuti. Per richiedere la rimozione di contenuti da [SECOND_LIFE], devi compilare una denuncia valida di violazione come definito nelle nostra [http://secondlife.com/corporate/dmca.php Regole DMCA] (leggi sul copyright). -Se desideri egualmente continuare con il processo di Abuso, chiudi questa finestra e completa la compilazione della segnalazione. Puoi specificare la categoria specifica 'CopyBot o Sfruttamento Permessi'. +Per continuare con il procedimento di abuso, chiudi questa finestra e completa la compilazione della segnalazione. È possibile che dovrai specificare la categoria CopyBot o Sfruttamento dei diritti. Grazie, @@ -1775,7 +1776,7 @@ Linden Lab C'è già un oggetto indossato in questo punto del corpo. Vuoi sostituirlo con l'oggetto selezionato? <form name="form"> - <ignore name="ignore" save_option="true" text="Sostituisci un preesistente attachment con l'elemento selezionato"/> + <ignore name="ignore" save_option="true" text="Sostituisci un pezzo collegato con l'elemento selezionato"/> <button ignore="Replace Automatically" name="Yes" text="OK"/> <button ignore="Never Replace" name="No" text="Annulla"/> </form> @@ -1785,21 +1786,21 @@ Vuoi sostituirlo con l'oggetto selezionato? Desideri abbandonare la modalità 'Occupato' prima di completare questa transazione? <form name="form"> - <ignore name="ignore" save_option="true" text="Sto per pagare una persona o un oggetto mentro sono Non Disponibile"/> + <ignore name="ignore" save_option="true" text="Sto per pagare una persona o un oggetto mentro sono in modalià Non disponibile"/> <button ignore="Always leave Busy Mode" name="Yes" text="OK"/> <button ignore="Never leave Busy Mode" name="No" text="Abbandona"/> </form> </notification> <notification name="ConfirmDeleteProtectedCategory"> - La cartella '[FOLDERNAME]' è una cartella di sistema. La cancellazione delle cartelle di sistema può creare instabilità. Sei sicuro di volerla cancellare? - <usetemplate ignoretext="Conferma prima di cancellare una cartella di sistema" name="okcancelignore" notext="Cancella" yestext="OK"/> + La cartella '[FOLDERNAME]' è una cartella di sistema. L'eliminazione di cartelle di sistema può creare instabilità. Sei sicuro di volerla eliminare? + <usetemplate ignoretext="Chiedi conferma prima di eliminare una cartella di sistema" name="okcancelignore" notext="Annulla" yestext="OK"/> </notification> <notification name="ConfirmEmptyTrash"> - Vuoi veramente cancellare permanentemente il contenuto del tuo Cestino? - <usetemplate ignoretext="Conferma lo svuotamento del contenuto del Cestino" name="okcancelignore" notext="Annulla" yestext="OK"/> + Vuoi veramente eliminare in modo permanente il contenuto del tuo Cestino? + <usetemplate ignoretext="Conferma prima di svuotare la cartella del Cestino inventario" name="okcancelignore" notext="Annulla" yestext="OK"/> </notification> <notification name="ConfirmClearBrowserCache"> - Vuoi veramente cancellare la storia dei viaggi, web e delle ricerche fatte? + Vuoi veramente eliminare la cronologia viaggi, web e ricerche fatte? <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/> </notification> <notification name="ConfirmClearCookies"> @@ -1811,14 +1812,14 @@ Desideri abbandonare la modalità 'Occupato' prima di completare quest <usetemplate name="okcancelbuttons" notext="Annulla" yestext="Si"/> </notification> <notification name="ConfirmEmptyLostAndFound"> - Vuoi veramente cancellare permanentemente il contenuto dei tuoi Persi e Ritrovati? - <usetemplate ignoretext="Conferma lo svuotamento della cartella Persi e Ritrovati" name="okcancelignore" notext="No" yestext="Si"/> + Vuoi veramente eliminare in modo definitivo il contenuto dei tuoi Oggetti smarriti? + <usetemplate ignoretext="Conferma prima di svuotare della cartella Oggetti smarriti" name="okcancelignore" notext="No" yestext="Si"/> </notification> <notification name="CopySLURL"> Lo SLurl seguente è stato copiato negli Appunti: [SLURL] -Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubicazione, o provala incollandola nella barra indirizzo di un browser web. +Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubicazione, o provala incollandola nella barra degli indirizzi di un browser web. <form name="form"> <ignore name="ignore" text="Lo SLurl è stato copiato negli Appunti"/> </form> @@ -1886,18 +1887,18 @@ Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubica <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="Cannot_Purchase_an_Attachment"> - Non puoi comprare un oggetto mentre è indossato. + Non puoi comprare un oggetto mentre è unito. </notification> <notification label="Informazioni sulle richieste per il permesso di addebito" name="DebitPermissionDetails"> Accettare questa richiesta da allo script il permesso continuativo di prendere Linden dollar (L$) dal tuo account. Per revocare questo permesso, il proprietario dell'oggetto deve cancellare l'oggetto oppure reimpostare gli script nell'oggetto. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="AutoWearNewClothing"> - Vuoi indossare automaticamente gli oggetti che stai per creare? - <usetemplate ignoretext="Indossa gli abiti che creo mentre modifico il Mio Aspetto" name="okcancelignore" notext="No" yestext="Si"/> + Vuoi indossare automaticamente gli indumenti che stai per creare? + <usetemplate ignoretext="Indossare gli abiti che creo mentre modifico il mio aspetto" name="okcancelignore" notext="No" yestext="Si"/> </notification> <notification name="NotAgeVerified"> - Devi avere l'Età Verificata per visitare quest'area. Vuoi andare sul sito [SECOND_LIFE] per verificare la tua età? + Per entrare in questa zona, devi avere eseguito la verifica dell'età. Vuoi andare sul sito di [SECOND_LIFE] per verificare la tua età? [_URL] <url name="url" option="0"> @@ -1906,13 +1907,13 @@ Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubica <usetemplate ignoretext="Non ho verificato la mia età" name="okcancelignore" notext="No" yestext="Si"/> </notification> <notification name="Cannot enter parcel: no payment info on file"> - Devi avere le Informazioni di Pagamento registrate per poter visitare quest'area. Vuoi andare sul sito di [SECOND_LIFE] ed impostarle? + Per poter visitare questa zona devi avere devi aver fornito informazioni di pagamento a Linden Lab. Vuoi andare sul sito di [SECOND_LIFE] ed impostarle? [_URL] <url name="url" option="0"> https://secondlife.com/account/index.php?lang=it </url> - <usetemplate ignoretext="Manca la registrazione delle Informazioni di Pagamento" name="okcancelignore" notext="No" yestext="Si"/> + <usetemplate ignoretext="Manca la registrazione delle informazioni di pagamento" name="okcancelignore" notext="No" yestext="Si"/> </notification> <notification name="MissingString"> La stringa [STRING_NAME] non è presente in strings.xml @@ -1942,7 +1943,7 @@ Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubica [FIRST] [LAST] è Offline </notification> <notification name="AddSelfFriend"> - Anche se sei molto piacevole, non puoi aggiungerti come amicizia. + Anche se sei molto simpatico, non puoi aggiungere te stesso all'elenco degli amici. </notification> <notification name="UploadingAuctionSnapshot"> Sto importando le fotografie per l'uso inworld e per il web... @@ -1961,7 +1962,7 @@ Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubica Terrain.raw caricato </notification> <notification name="GestureMissing"> - Manca la Gesture [NAME] dal database. + Manca la gesture [NAME] dal database. </notification> <notification name="UnableToLoadGesture"> Impossibile caricare la gesture [NAME]. @@ -1973,14 +1974,14 @@ Inseriscilo in una pagina web per dare ad altri un accesso facile a questa ubica Impossibile caricare il Landmark di riferimento. Riprova. </notification> <notification name="CapsKeyOn"> - Hai il Blocco delle Maiuscole attivato. -Questo potrebbe influenzare la tua password. + Hai il blocco delle maiuscole attivato. +Questo potrebbe incidere sulla tua password. </notification> <notification name="NotecardMissing"> Notecard non trovata nel database. </notification> <notification name="NotecardNoPermissions"> - Non hai il permesso di vedere questa notecard. + Non hai il permesso di vedere questo biglietto. </notification> <notification name="RezItemNoPermissions"> Permessi insufficienti per creare un oggetto. @@ -2018,7 +2019,7 @@ Riprova. Riprova. </notification> <notification name="CannotBuyObjectsFromDifferentOwners"> - Puoi comprare oggetti solo da un proprietario per volta. + Puoi acquistare oggetti soltanto da un proprietario per volta. Seleziona solo un oggetto. </notification> <notification name="ObjectNotForSale"> @@ -2031,10 +2032,10 @@ Seleziona solo un oggetto. Esci dalla modalità divina, livello [LEVEL] </notification> <notification name="CopyFailed"> - Non hai i permessi per copiare. + Non hai l'autorizzazione a copiare. </notification> <notification name="InventoryAccepted"> - [NAME] ha ricevuto la tua offerta di Inventory. + [NAME] ha ricevuto la tua offerta di inventario. </notification> <notification name="InventoryDeclined"> [NAME] non ha accettato la tua offerta dall'inventario. @@ -2049,9 +2050,9 @@ Seleziona solo un oggetto. Il tuo biglietto da visita non è stato accettato. </notification> <notification name="TeleportToLandmark"> - Puoi teleportarti alle ubicazioni come '[NAME]' aprendo il pannello Luoghi sul lato destro dello schermo, e quindi selezionare la linguetta Landmarks. -Clicca su un landmark per selezionarlo e quindi clicca 'Teleport' sul fondo del pannello. -(Puoi anche fare doppio-click sul landmark oppure cliccarlo con il tasto destro e scegliere 'Teleport'.) + Puoi teleportarti alle ubicazioni come '[NAME]' aprendo il pannello Luoghi sul lato destro dello schermo, quindi selezionare la scheda Punti di riferimento. +Clicca su un punto di riferimento per selezionarlo, quindi clicca su Teleport sul lato inferiore del pannello. +(Puoi anche fare doppio clic sul punto di riferimento oppure cliccare su di esso con il tasto destro del mouse e scegliere Teleport.) </notification> <notification name="TeleportToPerson"> Puoi contattare il residente '[NAME]' aprendo il pannello Persone nel lato destro del tuo schermo. @@ -2106,19 +2107,19 @@ Prova a selezionare una parte di terreno più piccola. [NAMES] </notification> <notification name="NoQuickTime"> - Il Software QuickTime di Apple non sembra installato sul tuo computer. -Se vuoi vedere contenuto multimediale sugli appezzamenti che lo supportano devi andare su [http://www.apple.com/quicktime QuickTime site] e installare il Player QuickTime. + Il software QuickTime di Apple sembra non essere installato sul tuo computer. +Se vuoi vedere contenuto multimediale in streaming sui lotti che lo supportano, vai alla pagina [http://www.apple.com/quicktime QuickTime] e installa il Player QuickTime. </notification> <notification name="NoPlugin"> - Nessun Media Plugin è stato trovato per gestire "[MIME_TYPE]" il tipo mime. Il Media di questo tipo non è disponibile. + Non è stato trovato alcun plugin multimediale per gestire il tipo mime [MIME_TYPE]. Il media di questo tipo non è disponibile. </notification> <notification name="MediaPluginFailed"> - Questo Media Plugin non funziona: + Questo plugin multimediale non funziona: [PLUGIN] -Per favore re-installa il plugin o contatta il venditore se continui ad avere questi problemi. +Reinstalla il plugin o contatta il venditore se continui ad avere questi problemi. <form name="form"> - <ignore name="ignore" text="Mancato funzionamento del Media Plugin"/> + <ignore name="ignore" text="Mancato funzionamento del plugin multimediale"/> </form> </notification> <notification name="OwnedObjectsReturned"> @@ -2143,21 +2144,21 @@ Gli oggetti non trasferibili che erano stati ceduti al gruppo sono stati cancell <nolink>[MSG]</nolink> </notification> <notification name="NotSafe"> - Questo terreno è abilitato ai Danni da combattimento. -Qui potresti ricevere ferite. Se dovessi morire verrai teleportato a casa tua. + Su questo terreno sono abilitati i danni. +Qui potresti essere ferito. Se dovessi morire verrai teleportato a casa tua. </notification> <notification name="NoFly"> - Quest'are ha il volo disabilitato. + In questa zona è proibito il volo. Qui non puoi volare. </notification> <notification name="PushRestricted"> - Quest'area non consente le spinte. Non puoi spingere gli altri a meno che tu non sia il proprietario del terreno. + Questa zona non consente le spinte. Non puoi spingere gli altri a meno che tu non sia il proprietario del terreno. </notification> <notification name="NoVoice"> - Quest'area ha la chat voice disabilitata. Non puoi sentire nessuno parlare. + Questa zona ha la chat vocale disattivata. Non puoi sentire nessuno parlare. </notification> <notification name="NoBuild"> - Quest'area ha il building disabilitato. Qui non puoi costruire o rezzare oggetti. + In questa zona è proibita la costruzione. Qui non puoi costruire né rezzare oggetti. </notification> <notification name="ScriptsStopped"> Un amministratore ha temporaneamente disabilitato gli script in questa regione. @@ -2168,10 +2169,10 @@ Qui non puoi volare. <notification name="NoOutsideScripts"> Questo terreno non consente script esterni. -Qui funzinano solo gli script del proprietario del terreno. +Qui funzionano soltanto gli script del proprietario del terreno. </notification> <notification name="ClaimPublicLand"> - Puoi solo chiedere terreni pubblici nella regione in cui sei posizionato. + Puoi solo richiedere terreni pubblici nella regione in cui sei posizionato. </notification> <notification name="RegionTPAccessBlocked"> Non puoi entrare in quella regione a causa della tua categoria di accesso. Può essere necessario validare l'età e/o installare l'ultima versione del programma. @@ -2352,12 +2353,12 @@ Questo sarà aggiunto nel tuo inventario come segnalibro per consentirti di invi </form> </notification> <notification name="RegionRestartMinutes"> - Questa regione farà il restart fra [MINUTES] minuti. -Se rimani qui verrai disconnesso. + Questa regione verrà riavviata fra [MINUTES] minuti. +Se rimani qui verrai scollegato da Second Life. </notification> <notification name="RegionRestartSeconds"> - Questa regione farà il restart fra [SECONDS] secondi. -Se rimani qui verrai disconnesso. + Questa regione verrà riavviata fra [SECONDS] secondi. +Se rimani qui verrai scollegato da Second Life. </notification> <notification name="LoadWebPage"> Caricare pagina web [URL]? @@ -2394,9 +2395,9 @@ Va bene? Un oggetto di nome '[OBJECTNAME]', posseduto da '[NAME]' vorrebbe: [QUESTIONS] -Se non ti fidi di questo oggetto e del suo creatore dovresti declinare la richiesta. +Se non ti fidi di questo oggetto e del suo ideatore, dovresti rifiutare la richiesta. -Consenti questa richiesta? +Concedi questa richiesta? <form name="form"> <button name="Grant" text="Accetta"/> <button name="Deny" text="Nega"/> @@ -2418,11 +2419,11 @@ Consenti questa richiesta? </form> </notification> <notification name="BuyLindenDollarSuccess"> - Grazie per il pagamento! + Grazie per aver inviato il pagamento. -Il tuo saldo in L$ sarà aggiornato al termine dell'elaborazione. Se l'elaborazione dovesse impiegare più di 20 minuti, la transazione verrà annullata. In quel caso l'ammontare dell'acquisto verrà rimborsato nel tuo saldo in US$. +Il tuo saldo in L$ sarà aggiornato al termine dell'elaborazione. Se l'elaborazione dovesse impiegare più di 20 minuti, la transazione verrà annullata. In quel caso l'ammontare dell'acquisto verrà accreditato sul tuo saldo in US$. -Lo stato del tuo pagamento potrà essere controllato nella pagina della Storia delle tue Transazioni su [http://secondlife.com/account/ Pannello di Controllo] +Potrai controllare lo stato del pagamento nella pagina della cronologia delle transazioni nel tuo [http://secondlife.com/account/ Dashboard] </notification> <notification name="FirstOverrideKeys"> I tuoi movimenti della tastiera vengono ora gestiti da un oggetto. @@ -2431,16 +2432,16 @@ Alcuni oggetti (come pistole) richiedono di andare in mouselook per il loro util Premi 'M' per farlo. </notification> <notification name="FirstSandbox"> - Questa è una Sandbox, serve per aiutare i Residenti ad imparare a costruire. + Questa è una Sandbox, serve ai residenti per imparare a costruire. -Gli oggetti che costruisci qui saranno cancellati dopo che te ne sei andato, perciò non dimenticare di cliccare sulle tue creazioni col tasto destro e scegliere 'Prendi' per trasferirle nel tuo Inventory. +Gli oggetti che costruisci qui verranno eliminati dopo che te ne sei andato, perciò non dimenticare di cliccare sulle tue creazioni col tasto destro del mouse e scegliere Prendi per trasferirle nel tuo Inventario. </notification> <notification name="MaxListSelectMessage"> È possibile selezionare solo fino a [MAX_SELECT] oggetti da questa lista. </notification> <notification name="VoiceInviteP2P"> - [NAME] ti sta invitando ad una chiamata in Chat Voice. -Clicca Accetta per unirti alla chiamata oppure Declina per declinare l'invito. Clicca Blocca per bloccare questo chiamante. + [NAME] ti sta invitando ad una chiamata in chat vocale. +Clicca su Accetta per unirti alla chiamata oppure su Declina to declinare l'invito. Clicca su Blocca per bloccare questo chiamante. <form name="form"> <button name="Accept" text="Accetta"/> <button name="Decline" text="Rifiuta"/> @@ -2448,17 +2449,17 @@ Clicca Accetta per unirti alla chiamata oppure Declina per declinare l'invi </form> </notification> <notification name="AutoUnmuteByIM"> - Hai appena inviato un IM a [FIRST] [LAST], che è stato automaticamente sbloccato. + [FIRST] [LAST] ha ricevuto un IM ed è stato automaticamente sbloccato. </notification> <notification name="AutoUnmuteByMoney"> - Hai appena inviato del denaro a [FIRST] [LAST], che è stato automaticamente sbloccato. + [FIRST] [LAST] ha ricevuto del denaro e pertanto è stato automaticamente sbloccato. </notification> <notification name="AutoUnmuteByInventory"> - Hai appena offerto un elemento dell'Inventory a [FIRST] [LAST], che è stato automaticamente sbloccato. + A [FIRST] [LAST] è stato offerto un elemento dell'Inventario e pertanto è stato automaticamente sbloccato. </notification> <notification name="VoiceInviteGroup"> - [NAME] si è aggiunto alla chiamata in Chat Voice con il gruppo [GROUP]. -Clicca Accetta per unirti alla chiamata oppure Declina per declinare l'invito. Clicca Blocca per bloccare questo chiamante. + [NAME] si è aggiunto alla chiamata in chat vocale con il gruppo [GROUP]. +Clicca su Accetta per unirti alla chiamata oppure su Declina to declinare l'invito. Clicca su Blocca per bloccare questo chiamante. <form name="form"> <button name="Accept" text="Accetta"/> <button name="Decline" text="Rifiuta"/> @@ -2466,8 +2467,8 @@ Clicca Accetta per unirti alla chiamata oppure Declina per declinare l'in </form> </notification> <notification name="VoiceInviteAdHoc"> - [NAME] si è aggiunto alla chiamata in Chat Voice con una conferenza. -Clicca Accetta per unirti alla chiamata oppure Declina to declinare l'invito. Clicca Blocca per bloccare questo chiamante. + [NAME] si è aggiunto alla chiamata in chat vocale con una conferenza. +Clicca su Accetta per unirti alla chiamata oppure su Declina to declinare l'invito. Clicca su Blocca per bloccare questo chiamante. <form name="form"> <button name="Accept" text="Accetta"/> <button name="Decline" text="Rifiuta"/> @@ -2476,7 +2477,7 @@ Clicca Accetta per unirti alla chiamata oppure Declina to declinare l'invit </notification> <notification name="InviteAdHoc"> [NAME] ti sta invitando ad una conferenza in chat. -Clicca Accetta per unirti alla chat oppure Declina per declinare l'invito. Clicca Blocca per bloccare questo chiamante. +Clicca su Accetta per unirti alla chat oppure su Declina per declinare l'invito. Clicca su Blocca per bloccare questo chiamante. <form name="form"> <button name="Accept" text="Accetta"/> <button name="Decline" text="Rifiuta"/> @@ -2490,25 +2491,25 @@ Clicca Accetta per unirti alla chat oppure Declina per declinare l'invito. Siamo spiacenti. Questa area ha raggiunto la capacità massima per le chiamate voice. Si prega di provare ad usare il voice in un'altra area. </notification> <notification name="VoiceChannelDisconnected"> - Sei stato disconnesso da [VOICE_CHANNEL_NAME]. Verrai ora riconnesso alla Chat Voice Locale. + Sei stato scollegato da [VOICE_CHANNEL_NAME]. Verrai ora ricollegato alla chat vocale nei dintorni. </notification> <notification name="VoiceChannelDisconnectedP2P"> - [VOICE_CHANNEL_NAME] ha terminato la chiamata. Verrai ora riconnesso alla Chat Voice Locale. + [VOICE_CHANNEL_NAME] ha chiuso la chiamata. Verrai ora ricollegato alla chat vocale nei dintorni. </notification> <notification name="P2PCallDeclined"> - [VOICE_CHANNEL_NAME] ha declinato la tua chiamata. Verrai ora riconnesso alla Chat Voice Locale. + [VOICE_CHANNEL_NAME] ha declinato la tua chiamata. Verrai ora ricollegato alla chat vocale nei dintorni. </notification> <notification name="P2PCallNoAnswer"> - [VOICE_CHANNEL_NAME] non è disponibile per la tua chiamata. Verrai ora riconnesso alla Chat Voice Locale. + [VOICE_CHANNEL_NAME] non è disponibile per la tua chiamata. Verrai ora ricollegato alla chat vocale nei dintorni. </notification> <notification name="VoiceChannelJoinFailed"> - Connessione a [VOICE_CHANNEL_NAME] fallita, riprova più tardi. Verrai ora riconnesso alla Chat Voice Locale. + Collegamento a [VOICE_CHANNEL_NAME] non riuscito, riprova più tardi. Verrai ora ricollegato alla chat vocale nei dintorni. </notification> <notification name="VoiceLoginRetry"> Stiamo creando una canale voice per te. Questo può richiedere fino a un minuto. </notification> <notification name="Cannot enter parcel: not a group member"> - Soltanto i membri di uno specifico gruppo possono visitare quest'area. + Soltanto i membri di un determinato gruppo possono visitare questa zona. </notification> <notification name="Cannot enter parcel: banned"> Non puoi entrare nel terreno, sei stato bloccato. @@ -2523,17 +2524,17 @@ Clicca Accetta per unirti alla chat oppure Declina per declinare l'invito. Si è verificato un errore durante il tentativo di collegarti a una voice chat con [VOICE_CHANNEL_NAME]. Riprova più tardi. </notification> <notification name="ServerVersionChanged"> - Sei appena entrato in una regione che usa una versione differente del server, questo potrebbe influenzare le prestazioni. [[URL] Guarda le Release Notes.] + Sei appena entrato in una regione che usa una versione differente del server: ciò potrebbe incidere sule prestazioni. [[URL] Visualizza le note sulla versione.] </notification> <notification name="UnsupportedCommandSLURL"> - Lo SLurl che hai cliccato non è attivo. + Lo SLurl su cui hai cliccato non è valido. </notification> <notification name="BlockedSLURL"> - Uno SLurl è stato ricevuto da un browser sconosciuto e per la tua sicurezza è stato bloccato. + Uno SLurl è stato ricevuto da un browser sconosciuto o non sicuro e, per sicurezza, è stato bloccato. </notification> <notification name="ThrottledSLURL"> - Multipli SLurls sono stati ricevuti da un browser sconosciuto in un breve periodo. -Per la tua sicurezza verranno bloccati per alcuni secondi. + Sono stati ricevuti più SLurl da un browser sconosciuto o non sicuro in un breve periodo di tempo. +Per sicurezza, verranno bloccati per alcuni secondi. </notification> <notification name="IMToast"> [MESSAGE] @@ -2546,18 +2547,18 @@ Per la tua sicurezza verranno bloccati per alcuni secondi. <usetemplate ignoretext="Conferma prima della chiusura di tutti gli IM" name="okcancelignore" notext="Annulla" yestext="OK"/> </notification> <notification name="AttachmentSaved"> - L'Allegato (Attachment) è stato salvato. + L'elemento da collegare è stato salvato. </notification> <notification name="UnableToFindHelpTopic"> - Impossibilitato a trovare il tema aiuto per questo elemento (nozione)???!!!!. + Impossibile trovare l'argomento nell'aiuto per questo elemento. </notification> <notification name="ObjectMediaFailure"> - Errore del Server: aggiornamento del Media o mancato funzionamento. + Errore del server: mancato aggiornamento o ottenimento del media. '[ERROR]' <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="TextChatIsMutedByModerator"> - Il tuo testo nella chat è stato interrotto dal moderatore. + La tua chat di testo è stata interrotta dal moderatore. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="VoiceIsMutedByModerator"> @@ -2566,19 +2567,19 @@ Per la tua sicurezza verranno bloccati per alcuni secondi. </notification> <notification name="ConfirmClearTeleportHistory"> Sei sicuro di volere cancellare la cronologia dei tuoi teleport? - <usetemplate name="okcancelbuttons" notext="Cancella" yestext="OK"/> + <usetemplate name="okcancelbuttons" notext="Annulla" yestext="OK"/> </notification> <notification name="BottomTrayButtonCanNotBeShown"> - Il bottone selezionato non può essere mostrato in questo momento. -Il bottone verrà mostrato quando ci sarà abbastanza spazio. + Il pulsante selezionato non può essere visualizzato in questo momento. +Il pulsante verrà visualizzato quando lo spazio sarà sufficiente. </notification> <global name="UnsupportedCPU"> - La velocità della tua CPU non soddisfa i requisiti minimi. </global> <global name="UnsupportedGLRequirements"> - Non sembra che tu abbia i requisiti hardware adeguati per [APP_NAME]. [APP_NAME] richiede una scheda grafica OpenGL con supporto multitexture. Se tu ce l'hai, dovresti accertarti di avere i driver, i service pack e le patch più recenti della scheda grafica e del tuo sistema operativo. + Non sembra che tu abbia i requisiti hardware adeguati per [APP_NAME]. [APP_NAME] richiede una scheda grafica OpenGL con supporto multitexture. Se ne hai una in dotazione, accertati di avere i driver, i service pack e i patch più recenti per la scheda grafica e per il sistema operativo. -Se continui ad avere problemi, visita [SUPPORT_SITE]. +Se continui ad avere problemi, visita la pagina [SUPPORT_SITE]. </global> <global name="UnsupportedCPUAmount"> 796 @@ -2593,7 +2594,7 @@ Se continui ad avere problemi, visita [SUPPORT_SITE]. - La memoria del tuo sistema non soddisfa i requisiti minimi. </global> <global name="You can only set your 'Home Location' on your land or at a mainland Infohub."> - Se possiedi una parte di terra, puoi creare qui la tua ubicazione di casa. -Altrimenti, puoi guardare sulla Mappa e trovare luoghi segnalati come "Infohub". + Se sei proprietario di un appezzamento di terreno, puoi definirlo come la tua posizione iniziale. +In alternativa, puoi guardare sulla mappa e trovare luoghi segnalati come "Infohub". </global> </notifications> diff --git a/indra/newview/skins/default/xui/it/panel_bottomtray.xml b/indra/newview/skins/default/xui/it/panel_bottomtray.xml index ccefc91ce1..c0218fad5e 100644 --- a/indra/newview/skins/default/xui/it/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/it/panel_bottomtray.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="bottom_tray"> <string name="SpeakBtnToolTip"> - Microfono on/off + Accende o spegne il microfono </string> <string name="VoiceControlBtnToolTip"> - Mostra/nascondi il pannello voice control + Mostra o nasconde il pannello di regolazione voce </string> <layout_stack name="toolbar_stack"> <layout_panel name="speak_panel"> @@ -13,13 +13,13 @@ </talk_button> </layout_panel> <layout_panel name="gesture_panel"> - <gesture_combo_list label="Gesture" name="Gesture" tool_tip="Mostra/nascondi gestures"/> + <gesture_combo_list label="Gesture" name="Gesture" tool_tip="Mostra o nasconde le gesture"/> </layout_panel> <layout_panel name="movement_panel"> - <button label="Sposta" name="movement_btn" tool_tip="Mostra/nascondi i controlli del movimento"/> + <button label="Sposta" name="movement_btn" tool_tip="Mostra o nasconde i comandi del movimento"/> </layout_panel> <layout_panel name="cam_panel"> - <button label="Visualizza" name="camera_btn" tool_tip="Mostra/nascondi i controlli della camera"/> + <button label="Visuale" name="camera_btn" tool_tip="Mostra o nasconde le regolazioni della visuale"/> </layout_panel> <layout_panel name="snapshot_panel"> <button label="" name="snapshots" tool_tip="Scatta una foto"/> diff --git a/indra/newview/skins/default/xui/it/panel_edit_alpha.xml b/indra/newview/skins/default/xui/it/panel_edit_alpha.xml index 652bef0430..286ee626cf 100644 --- a/indra/newview/skins/default/xui/it/panel_edit_alpha.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_alpha.xml @@ -2,7 +2,7 @@ <panel name="edit_alpha_panel"> <panel name="avatar_alpha_color_panel"> <texture_picker label="Alpha inferiore" name="Lower Alpha" tool_tip="Clicca per scegliere una fotografia"/> - <texture_picker label="Alpha superiore" name="Upper Alpha" tool_tip="Click to choose a picture"/> + <texture_picker label="Alpha superiore" name="Upper Alpha" tool_tip="Clicca per scegliere una fotografia"/> <texture_picker label="Alpha della testa" name="Head Alpha" tool_tip="Clicca per scegliere una fotografia"/> <texture_picker label="Alpha dell'occhio" name="Eye Alpha" tool_tip="Clicca per scegliere una fotografia"/> <texture_picker label="Alpha dei capelli" name="Hair Alpha" tool_tip="Clicca per scegliere una fotografia"/> diff --git a/indra/newview/skins/default/xui/it/panel_edit_skin.xml b/indra/newview/skins/default/xui/it/panel_edit_skin.xml index 2fa76d4afc..9e05599470 100644 --- a/indra/newview/skins/default/xui/it/panel_edit_skin.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_skin.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_skin_panel"> <panel name="avatar_skin_color_panel"> - <texture_picker label="Tatuaggi Testa" name="Head Tattoos" tool_tip="Clicca per scegliere un'immagine"/> - <texture_picker label="Tatuaggi superiori" name="Upper Tattoos" tool_tip="Clicca per scegliere un'immagine"/> - <texture_picker label="Tatuaggi inferiori" name="Lower Tattoos" tool_tip="Clicca per scegliere un'immagine"/> + <texture_picker label="Tatuaggi testa" name="Head Tattoos" tool_tip="Clicca per scegliere una fotografia"/> + <texture_picker label="Tatuaggi superiori" name="Upper Tattoos" tool_tip="Clicca per scegliere una fotografia"/> + <texture_picker label="Tatuaggi inferiori" name="Lower Tattoos" tool_tip="Clicca per scegliere una fotografia"/> </panel> <accordion name="wearable_accordion"> <accordion_tab name="skin_color_tab" title="Colore della pelle"/> - <accordion_tab name="skin_face_tab" title="Dettagli del Viso"/> - <accordion_tab name="skin_makeup_tab" title="Trucco"/> - <accordion_tab name="skin_body_tab" title="Dettagli del Corpo"/> + <accordion_tab name="skin_face_tab" title="Dettagli del viso"/> + <accordion_tab name="skin_makeup_tab" title="Makeup"/> + <accordion_tab name="skin_body_tab" title="Dettagli del corpo"/> </accordion> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_edit_socks.xml b/indra/newview/skins/default/xui/it/panel_edit_socks.xml index 1d1eb4bd3a..d2af3ebd5a 100644 --- a/indra/newview/skins/default/xui/it/panel_edit_socks.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_socks.xml @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_socks_panel"> <panel name="avatar_socks_color_panel"> - <texture_picker label="Tessuto" name="Fabric" tool_tip="Clicca per scegliere una foto"/> + <texture_picker label="Tessuto" name="Fabric" tool_tip="Clicca per scegliere una fotografia"/> <color_swatch label="Colore/Tinta" name="Color/Tint" tool_tip="Clicca per aprire il selettore dei colori"/> </panel> <accordion name="wearable_accordion"> - <accordion_tab name="socks_main_tab" title="Calze"/> + <accordion_tab name="socks_main_tab" title="Calzini"/> </accordion> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml index baf585dad0..2583cf4e0e 100644 --- a/indra/newview/skins/default/xui/it/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/it/panel_edit_wearable.xml @@ -1,55 +1,55 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Indossabile" name="panel_edit_wearable"> <string name="edit_shape_title"> - Modifica la Shape + Modifica della figura corporea </string> <string name="edit_skin_title"> - Modifica la Skin + Modifica della pelle </string> <string name="edit_hair_title"> - Modifica capelli + Modifica dei capelli </string> <string name="edit_eyes_title"> - Modifica occhi + Modifica degli occhi </string> <string name="edit_shirt_title"> - Modifica camicia + Modifica della camicia </string> <string name="edit_pants_title"> - Modifica pantaloni + Modifica dei pantaloni </string> <string name="edit_shoes_title"> - Modifica scarpe + Modifica delle scarpe </string> <string name="edit_socks_title"> - Modifica calze + Modifica delle calze </string> <string name="edit_jacket_title"> - Modifica Giacca + Modifica della giacca </string> <string name="edit_skirt_title"> - Modifica gonna + Modifica della gonna </string> <string name="edit_gloves_title"> - Modifica guanti + Modifica dei guanti </string> <string name="edit_undershirt_title"> - Modifica maglietta intima + Modifica della maglietta intima </string> <string name="edit_underpants_title"> - Modifica slip + Modifica dello slip </string> <string name="edit_alpha_title"> - Modifica Alpha Mask + Modifica di Alpha Mask </string> <string name="edit_tattoo_title"> - Modifica tatuaggio + Modifica del tatuaggio </string> <string name="shape_desc_text"> - Shape: + Figura corporea: </string> <string name="skin_desc_text"> - Skin: + Pelle: </string> <string name="hair_desc_text"> Capelli: @@ -90,9 +90,9 @@ <string name="tattoo_desc_text"> Tatuaggio: </string> - <text name="edit_wearable_title" value="Modifica Shape"/> + <text name="edit_wearable_title" value="Modifica della figura corporea"/> <panel label="Camicia" name="wearable_type_panel"> - <text name="description_text" value="Shape:"/> + <text name="description_text" value="Figura corporea:"/> </panel> <panel name="button_panel"> <button label="Salva con nome" name="save_as_button"/> diff --git a/indra/newview/skins/default/xui/it/panel_group_invite.xml b/indra/newview/skins/default/xui/it/panel_group_invite.xml index 346945baff..7874f588a5 100644 --- a/indra/newview/skins/default/xui/it/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/it/panel_group_invite.xml @@ -18,10 +18,10 @@ <text name="role_text"> Scegli che ruolo assegnare loro: </text> - <combo_box name="role_name" tool_tip="Choose from the list of Roles you are allowed to assign members to"/> + <combo_box name="role_name" tool_tip="Scegli dall'elenco dei ruoli ai quali ti è consentito assegnare i membri"/> <button label="Manda gli inviti" name="ok_button"/> <button label="Annulla" name="cancel_button"/> <string name="GroupInvitation"> - Invito del Gruppo + Invito di gruppo </string> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_group_land_money.xml b/indra/newview/skins/default/xui/it/panel_group_land_money.xml index 0ad4d9cd02..1e3ef5e657 100644 --- a/indra/newview/skins/default/xui/it/panel_group_land_money.xml +++ b/indra/newview/skins/default/xui/it/panel_group_land_money.xml @@ -1,19 +1,19 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Terra & L$" name="land_money_tab"> <panel.string name="help_text"> - Appare un avviso fino a quando la Terra Totale in Uso è meno o = alla Contribuzione Totale. + Viene visualizzata un'avvertenza fino a quando il terreno totale in uso è inferiore o uguale al contributo totale. </panel.string> <panel.string name="cant_view_group_land_text"> - Non hai i permessi per vedere la terra posseduta dal gruppo + Non sei autorizzato a vedere quali terreni appartengono al gruppo. </panel.string> <panel.string name="cant_view_group_accounting_text"> - Non hai i permessi per vedere le informazioni sulla contabilità del gruppo. + Non sei autorizzato a visionare le informazioni finanziarie del gruppo. </panel.string> <panel.string name="loading_txt"> Attendi... </panel.string> <panel.string name="land_contrib_error"> - Incapace di impostare la tua contribuzione di terreno + Impossibile definire il tuo contributo di terreno </panel.string> <panel name="layout_panel_landmoney"> <scroll_list name="group_parcel_list"> @@ -60,22 +60,22 @@ <tab_container name="group_money_tab_container"> <panel label="PIANIFICAZIONE" name="group_money_planning_tab"> <text_editor name="group_money_planning_text"> - Caricando... + Caricamento in corso... </text_editor> </panel> <panel label="DETTAGLI" name="group_money_details_tab"> <text_editor name="group_money_details_text"> - Caricando... + Caricamento in corso... </text_editor> <button label="< Precedente" label_selected="< Precedente" name="earlier_details_button" tool_tip="Indietro" width="90"/> - <button label="Successivo >" label_selected="Successivo >" left_delta="260" name="later_details_button" tool_tip="Prossimo" width="90"/> + <button label="Successivo >" label_selected="Successivo >" left_delta="260" name="later_details_button" tool_tip="Avanti" width="90"/> </panel> <panel label="VENDITE" name="group_money_sales_tab"> <text_editor name="group_money_sales_text"> - Caricando... + Caricamento in corso... </text_editor> <button label="< Precedente" label_selected="< Precedente" name="earlier_sales_button" tool_tip="Indietro" width="90"/> - <button label="Successivo >" label_selected="Successivo >" left_delta="260" name="later_sales_button" tool_tip="Prossimo" width="90"/> + <button label="Successivo >" label_selected="Successivo >" left_delta="260" name="later_sales_button" tool_tip="Avanti" width="90"/> </panel> </tab_container> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_group_notices.xml b/indra/newview/skins/default/xui/it/panel_group_notices.xml index e1e397392f..9dac282de9 100644 --- a/indra/newview/skins/default/xui/it/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/it/panel_group_notices.xml @@ -5,10 +5,10 @@ Puoi disattivare la ricezione delle notice nella finestra principale. </panel.string> <panel.string name="no_notices_text"> - Non ci sono vecchie Notice + Non ci sono avvisi precedenti </panel.string> <text name="lbl2"> - Le Notice sono conservate per 14 giorni. + Gli avvisi sono conservati per 14 giorni. Massimo 200 per gruppo al giorno </text> <scroll_list name="notice_list"> @@ -17,10 +17,10 @@ Massimo 200 per gruppo al giorno <scroll_list.columns label="Data" name="date"/> </scroll_list> <text name="notice_list_none_found"> - Nessuna trovata + Nessuno trovato </text> - <button label="Crea una nuova notice" label_selected="Crea una nuova notice" name="create_new_notice" tool_tip="Crea una nuova notice"/> - <button label="Aggiorna" label_selected="Aggiorna l'elenco" name="refresh_notices" tool_tip="Aggiorna la lista delle notice"/> + <button label="Crea un nuovo avviso" label_selected="Crea una nuova notice" name="create_new_notice" tool_tip="Crea un nuovo avviso"/> + <button label="Aggiorna" label_selected="Aggiorna l'elenco" name="refresh_notices" tool_tip="Aggiorna la lista degli avvisi"/> <panel label="Crea una nuova notice" name="panel_create_new_notice"> <text name="lbl"> Crea una notice @@ -41,15 +41,15 @@ Massimo 200 per gruppo al giorno Trascina e rilascia qui l'oggetto da allegare: </text> <button label="Rimuovi" label_selected="Rimuovi allegato" name="remove_attachment" tool_tip="Rimuovi allegato dal tuo avviso"/> - <button label="Spedisci" label_selected="Spedisci" name="send_notice"/> - <group_drop_target name="drop_target" tool_tip="Trascina un oggetto dall'inventario nello spazio ALLEGA per spedirlo con la notice. Devi avere i permessi copy e transfer relativi all'oggetto da allegare."/> + <button label="Invia" label_selected="Invia" name="send_notice"/> + <group_drop_target name="drop_target" tool_tip="Trascina un oggetto dall'inventario ín questa casella per spedirlo con questo avviso. Devi avere i diritti per la copia e il trasferimento per poter allegare l'oggetto."/> </panel> <panel label="Vedi le notice precedenti" name="panel_view_past_notice"> <text name="lbl"> Notice archiviate </text> <text name="lbl2"> - Per spedire una nuova notice, clicca il bottone + + Per spedire un nuovo avviso, clicca sul pulsante + </text> <text name="lbl3"> Oggetto: diff --git a/indra/newview/skins/default/xui/it/panel_me.xml b/indra/newview/skins/default/xui/it/panel_me.xml index 7a0805b936..66601aa165 100644 --- a/indra/newview/skins/default/xui/it/panel_me.xml +++ b/indra/newview/skins/default/xui/it/panel_me.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Mio Profilo" name="panel_me"> +<panel label="Il mio profilo" name="panel_me"> <tab_container name="tabs"> <panel label="IL MIO PROFILO" name="panel_profile"/> <panel label="I MIEI PREFERITI" name="panel_picks"/> diff --git a/indra/newview/skins/default/xui/it/panel_media_settings_security.xml b/indra/newview/skins/default/xui/it/panel_media_settings_security.xml index 5969c7bdba..785cd048a1 100644 --- a/indra/newview/skins/default/xui/it/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/it/panel_media_settings_security.xml @@ -5,7 +5,7 @@ Le mancate aperture di home page sono segnalate: </text> <button label="Aggiungi" name="whitelist_add"/> - <button label="Cancella" name="whitelist_del"/> + <button label="Elimina" name="whitelist_del"/> <text name="home_url_fails_whitelist"> Avvertenza: la home page specificata nella scheda Generale non ha superato la lista bianca. Viene disabilitata fino a che non venga inserita una voce valida. </text> diff --git a/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml b/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml index f7a58581d4..6317d3192e 100644 --- a/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml +++ b/indra/newview/skins/default/xui/it/panel_nearby_chat_bar.xml @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="chat_bar"> - <line_editor label="Clicca qui per la chat." name="chat_box" tool_tip="Premi Invio per dire, Ctrl+Invio per gridare"/> - <button name="show_nearby_chat" tool_tip="Mostra/Nasconde la chat log nei dintorni"/> + <string name="min_width"> + 192 + </string> + <string name="max_width"> + 320 + </string> + <line_editor label="Clicca qui per la chat." name="chat_box" tool_tip="Premi Invio per parlare, Ctrl+Invio per gridare"/> + <button name="show_nearby_chat" tool_tip="Mostra/Nasconde il registro della chat nei dintorni"/> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_notes.xml b/indra/newview/skins/default/xui/it/panel_notes.xml index cb805dae49..9ce6b47a32 100644 --- a/indra/newview/skins/default/xui/it/panel_notes.xml +++ b/indra/newview/skins/default/xui/it/panel_notes.xml @@ -1,20 +1,20 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Note & Privacy" name="panel_notes"> +<panel label="Note e Privacy" name="panel_notes"> <layout_stack name="layout"> <panel name="notes_stack"> <scroll_container name="profile_scroll"> <panel name="profile_scroll_panel"> <text name="status_message" value="Le mie note private:"/> - <text name="status_message2" value="Permetti a questa persona di:"/> - <check_box label="Vedermi On-line" name="status_check"/> - <check_box label="Vedermi sull mappa" name="map_check"/> - <check_box label="Modificare, cancellare o prendere i miei oggetti" name="objects_check"/> + <text name="status_message2" value="Consenti a questa persona di:"/> + <check_box label="Vedere se sono online" name="status_check"/> + <check_box label="Vedermi sulla mappa" name="map_check"/> + <check_box label="Modificare, eliminare o prendere i miei oggetti" name="objects_check"/> </panel> </scroll_container> </panel> <panel name="notes_buttons_panel"> <button label="Aggiungi amico" name="add_friend" tool_tip="Offri amicizia a questo residente"/> - <button label="IM" name="im" tool_tip="Apri una sessione di messaggio istantaneo"/> + <button label="IM" name="im" tool_tip="Apri una sessione messaggio istantaneo"/> <button label="Chiama" name="call" tool_tip="Chiama questo residente"/> <button label="Mappa" name="show_on_map_btn" tool_tip="Mostra il residente sulla mappa"/> <button label="Teleport" name="teleport" tool_tip="Offri teleport"/> diff --git a/indra/newview/skins/default/xui/it/panel_place_profile.xml b/indra/newview/skins/default/xui/it/panel_place_profile.xml index fef262d2b9..9a38909d47 100644 --- a/indra/newview/skins/default/xui/it/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/it/panel_place_profile.xml @@ -1,42 +1,42 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="place_profile"> - <string name="on" value="On"/> - <string name="off" value="Off"/> + <string name="on" value="Attivo"/> + <string name="off" value="Disattivato"/> <string name="anyone" value="Chiunque"/> <string name="available" value="disponibile"/> <string name="allocated" value="assegnato"/> - <string name="title_place" value="Profilo del luogo"/> + <string name="title_place" value="Profilo del posto"/> <string name="title_teleport_history" value="Cronologia Teleport"/> - <string name="not_available" value="(N\D)"/> + <string name="not_available" value="(non pert.)"/> <string name="unknown" value="(sconosciuto)"/> - <string name="public" value="(publico)"/> + <string name="public" value="(pubblico)"/> <string name="none_text" value="(nessuno)"/> - <string name="sale_pending_text" value="(Vendita in attesa di)"/> - <string name="group_owned_text" value="(Gruppo posseduto)"/> + <string name="sale_pending_text" value="(In corso di vendita)"/> + <string name="group_owned_text" value="(Di proprietà di un gruppo)"/> <string name="price_text" value="L$"/> <string name="area_text" value="m²"/> - <string name="all_residents_text" value="Tutti i Residenti"/> + <string name="all_residents_text" value="Tutti i residenti"/> <string name="group_text" value="Gruppo"/> <string name="can_resell"> - La terra acquistata in questa regione può essere rivenduta. + Il terreno acquistato in questa regione può essere rivenduto. </string> <string name="can_not_resell"> - La terra acquistata in questa regione non può essere rivenduta. + Il terreno acquistato in questa regione non può essere rivenduto. </string> <string name="can_change"> - La terra acquistata in questa regione può essere unita o suddivisa. + Il terreno acquistato in questa regione può essere unito o suddiviso. </string> <string name="can_not_change"> - La terra acquistata in questa regione non può essere unita o suddivisa. + Il terreno acquistato in questa regione non può essere unito o suddiviso. </string> <string name="server_update_text"> - Informazioni su questo luogo non disponibili senza l'aggiornamento del server. + Informazioni sul luogo non disponibili senza l'aggiornamento del server. </string> <string name="server_error_text"> - Informazioni su questo luogo non sono disponibili ora, per favore riprova più tardi. + Informazioni su questo luogo non disponibili al momento, riprova più tardi. </string> <string name="server_forbidden_text"> - Informazioni su questo luogo non sono disponibili a cause delle restrizioni sull'accesso. Per favore verifica i tuoi permessi con il proprietario del parcel. + Informazioni su questo luogo non disponibili a causa delle limitazioni di accesso. Controlla i tuoi permessi con il proprietario del terreno. </string> <string name="acquired_date"> [wkday,datetime,local] [mth,datetime,local] [day,datetime,local] [hour,datetime,local]:[min,datetime,local]:[second,datetime,local] [year,datetime,local] @@ -48,7 +48,7 @@ <text name="owner_label" value="Proprietario:"/> <text name="maturity_value" value="sconosciuto"/> <accordion name="advanced_info_accordion"> - <accordion_tab name="parcel_characteristics_tab" title="Parcel"> + <accordion_tab name="parcel_characteristics_tab" title="Lotto"> <panel name="parcel_characteristics_panel"> <text name="rating_label" value="Categoria:"/> <text name="rating_value" value="sconosciuto"/> diff --git a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml index 1fc75b2857..d02a794219 100644 --- a/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/it/panel_preferences_graphics1.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Grafica" name="Display panel"> <text name="UI Size:"> - misura UI: + Dimensioni UI: </text> <text name="QualitySpeed"> Qualità e velocità: @@ -99,7 +99,7 @@ </radio_group> </panel> <button label="Applica" label_selected="Applica" name="Apply"/> - <button label="Resetta" left="110" name="Defaults" width="190"/> - <button label="Avanzato" name="Advanced"/> + <button label="Reimposta" left="110" name="Defaults" width="190"/> + <button label="Avanzate" name="Advanced"/> <button label="Hardware" label_selected="Hardware" name="GraphicsHardwareButton"/> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_profile_view.xml b/indra/newview/skins/default/xui/it/panel_profile_view.xml index bf89a3e6f6..20c62d4ceb 100644 --- a/indra/newview/skins/default/xui/it/panel_profile_view.xml +++ b/indra/newview/skins/default/xui/it/panel_profile_view.xml @@ -6,11 +6,11 @@ <string name="status_offline"> Offline </string> - <text_editor name="user_name" value="(Caricando...)"/> + <text_editor name="user_name" value="(Caricamento in corso...)"/> <text name="status" value="Online"/> <tab_container name="tabs"> <panel label="PROFILO" name="panel_profile"/> - <panel label="PREFERITI" name="panel_picks"/> - <panel label="NOTE & PRIVACY" name="panel_notes"/> + <panel label="LUOGHI CONSIGLIATI" name="panel_picks"/> + <panel label="NOTE E PRIVACY" name="panel_notes"/> </tab_container> </panel> diff --git a/indra/newview/skins/default/xui/it/panel_status_bar.xml b/indra/newview/skins/default/xui/it/panel_status_bar.xml index 5b5ca57759..584ac5e4b4 100644 --- a/indra/newview/skins/default/xui/it/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/it/panel_status_bar.xml @@ -23,9 +23,9 @@ </panel.string> <button label="" label_selected="" name="buycurrency" tool_tip="Il mio saldo"/> <button label="Acquista" name="buyL" tool_tip="Clicca per comprare più L$"/> - <text name="TimeText" tool_tip="Ora attuale (Pacific)"> + <text name="TimeText" tool_tip="Orario attuale (Pacifico)"> 24:00, ora del Pacifico </text> <button name="media_toggle_btn" tool_tip="Attiva/ferma tutti i media (musica, video, pagine Web)"/> - <button name="volume_btn" tool_tip="Controllo del volume globale"/> + <button name="volume_btn" tool_tip="Regolazione del volume globale"/> </panel> diff --git a/indra/newview/skins/default/xui/it/role_actions.xml b/indra/newview/skins/default/xui/it/role_actions.xml index eab8e6b4e3..95f1f662f9 100644 --- a/indra/newview/skins/default/xui/it/role_actions.xml +++ b/indra/newview/skins/default/xui/it/role_actions.xml @@ -1,72 +1,72 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <role_actions> - <action_set description="Queste abilità permettono di aggiungere e rimuovere Membri dal gruppo, e permettono ai nuovi membri di aderire al gruppo senza invito." name="Membership"> - <action description="Invitare persone in questo Gruppo" longdescription="Invita Persone in questo Gruppo usando il bottone 'Invita' nella sezione Ruoli > tabella Membri." name="member invite"/> - <action description="Espellere Membri da questo Gruppo" longdescription="Espelli Membri dal Gruppo usando il bottone 'Espelli' nella sezione Ruoli > tabella Membri. Un Proprietario può espellere chiunque eccetto un altro Proprietario. Se tu non sei un Proprietario, un Membro può essere espulso da un gruppo solo ed unicamente, se hanno il Ruolo Everyone, e nessun altro Ruolo. Per rimuovere Membri dai Ruoli, devi avere l'Abilità 'Rimuovi Membri dai Ruoli'." name="member eject"/> - <action description="Seleziona 'Iscrizione libera' e modifica da 'Tassa d'Iscrizione'" longdescription="Seleziona 'Iscrizione libera' per permettere ai nuovi Membri di aderire senza invito, e modifica da 'Tassa d'Iscrizione' nella sezione Generale." name="member options"/> + <action_set description="Queste abilità permettono di aggiungere e rimuovere membri dal gruppo e consentono ai nuovi membri di aderire al gruppo senza invito." name="Membership"> + <action description="Invita persone in questo gruppo" longdescription="Invita persone in questo gruppo usando il pulsante Invita nella sezione Ruoli > scheda membri." name="member invite"/> + <action description="Espelli membri da questo gruppo" longdescription="Espelli membri dal gruppo usando il pulsante Espelli nella sezione Ruoli > scheda membri. Un proprietario può espellere chiunque tranne un altro proprietario. Se non sei un proprietario, un membro può essere espulso da un gruppo soltanto qualora abbia soltanto il ruolo Tutti, e nessun altro ruolo. Per rimuovere membri dai ruoli, devi avere l'Abilità corrispondente." name="member eject"/> + <action description="Seleziona Iscrizione libera e modifica la Quota d'iscrizione" longdescription="Seleziona Iscrizione libera per permettere ai nuovi membri di aderire senza invito e modifica la quota d'iscrizione nella scheda Generale." name="member options"/> </action_set> - <action_set description="Queste Abilità permettono di aggiungere, rimuovere, cambiare i Ruoli del Gruppo, aggiungere e rimuovere Membri dai Ruoli, e assegnare Abilità ai Ruoli." name="Roles"> - <action description="Creare nuovi Ruoli" longdescription="Crea nuovi Ruoli nella sezione Ruoli > tabella Ruoli." name="role create"/> - <action description="Cancellare Ruoli" longdescription="Cancella Ruoli nella sezione Ruoli > tabella Ruoli." name="role delete"/> - <action description="Cambia i nomi del Ruolo, titoli, descrizioni, se i membri in quel Ruolo sono resi pubblici" longdescription="Cambia i nomi del Ruolo, titoli, descrizioni, se i membri in quel Ruolo sono resi pubblici. Viene fatto nella parte bassa della sezione Ruoli > tabella Ruoli dopo avere selezionato un Ruolo." name="role properties"/> - <action description="Incaricare Membri ad Assegnare Ruoli" longdescription="Assegna un Ruolo a Membri nella lista dei Ruoli assegnati (Roles section > Members tab). Un Membro con questa Abilità può aggiungere Membri ad un Ruolo già presente nell'elenco." name="role assign member limited"/> - <action description="Assegnare Membri a tutti i Ruoli" longdescription="Assegna Tutti i Ruoli a Membri nella lista dei Ruoli Assegnati (Roles section > Members tab). *ATTENZIONE* Ogni Membro con questo Ruolo e Abilità può assegnarsi -- e assegnare ad altri Membri non Proprietari-- Ruoli con poteri maggiori di quelli normalmente concessi, potenzialmente elevandosi ai poteri concessi al Proprietario. Siate sicuri di quello che fate prima di assegnare questa Abilità." name="role assign member"/> - <action description="Rimuovere Membri dai Ruoli" longdescription="Rimuovi dai Ruoli i Membri nella lista dei Ruoli Assegnati (Roles section > Members tab). Il Proprietario non può essere rimosso." name="role remove member"/> - <action description="Assegnare e Rimuovere Abilità nei Ruoli" longdescription="Assegna e Rimuovi Abilità per ogni Ruolo nella lista dei Ruoli Assegnati (Roles section > Roles tab). *ATTENZIONE* Ogni Membro con questo Ruolo e Abilità può assegnarsi --ed assegnare ad altri Membri non Proprietà-- tutte le Abilità, che potenzialmente lo elevano ai poteri ai poteri concessi al Proprietario. Siate sicuri di quello che fate prima di assegnare questa Abilità ." name="role change actions"/> + <action_set description="Queste Abilità permettono di aggiungere, rimuovere, cambiare i ruoli del gruppo, aggiungere e rimuovere membri dai ruoli, nonché assegnare abilità ai ruoli." name="Roles"> + <action description="Creare nuovi ruoli" longdescription="Crea nuovi ruoli nella sezione Ruoli > scheda ruoli." name="role create"/> + <action description="Eliminare ruoli" longdescription="Elimina ruoli nella sezione Ruoli > scheda ruoli." name="role delete"/> + <action description="Cambia i nomi di ruoli, i titoli, le descrizioni e definisci se i membri in quel ruolo sono resi pubblici" longdescription="Cambia i nomi di ruoli, i titoli, le descrizioni e definisci se i membri in quel ruolo sono resi pubblici Viene fatto nella parte inferiore della sezione Ruoli > scheda Ruoli, dopo avere selezionato un ruolo." name="role properties"/> + <action description="Assegnare membri a ruoli del responsabile" longdescription="Assegna un ruolo a membri nella lista dei ruoli assegnati (sezione Ruoli > scheda membri). Un utente con questa Abilità può aggiungere membri ad un ruolo nel quale il responsabile è già presente." name="role assign member limited"/> + <action description="Assegnare membri a qualsiasi ruolo" longdescription="Assegna i membri a qualsiasi ruolo nell'elenco dei ruoli assegnati (sezione Ruoli > scheda membri). *ATTENZIONE* Ogni membro con questo Ruolo e Abilità può assegnarsi -- e assegnare ad altri membri non proprietari -- ruoli con poteri maggiori di quelli normalmente concessi, potenzialmente con poteri analoghi a quelli di proprietario. Sii sicuro della scelta prima di assegnare questa Abilità." name="role assign member"/> + <action description="Rimuovere membri dai ruoli" longdescription="Rimuovi dai ruoli i membri nell'elenco dei ruoli assegnati (sezione Ruoli > scheda membri). Il proprietario non può essere rimosso." name="role remove member"/> + <action description="Assegnare e rimuovere abilità nei ruoli" longdescription="Assegna e Rimuovi Abilità per ogni ruolo nell'elenco dei ruoli assegnati (sezione Ruoli > scheda Ruoli). *ATTENZIONE* Ogni membro con questo ruolo e Abilità può assegnarsi -- ed assegnare ad altri membri non proprietari -- tutte le Abilità, che potenzialmente con poteri analoghi a quelli di proprietario. Sii sicuro della scelta prima di assegnare questa Abilità." name="role change actions"/> </action_set> - <action_set description="Queste Abilità permettono di modificare l'identità di questo Gruppo, come il cambiamento della visibilità pubblica, lo statuto, e lo stemma." name="Group Identity"> - <action description="Cambiare lo Statuto, lo Stemma, e 'Mostra nel Cerca/Search'" longdescription="Cambia Statuto, Immagine, e 'Mostra nel Cerca'. Viene fatto nella sezione Generale." name="group change identity"/> + <action_set description="Queste abilità autorizzano a modificare l'identità di questo gruppo, come ad esempio la modifica della visibilità pubblica, lo statuto e il logo." name="Group Identity"> + <action description="Cambiare lo statuto, il logo, e 'Mostra nella ricerca'" longdescription="Cambia statuto, logo e 'Mostra nella ricerca'. Viene fatto nella sezione Generale." name="group change identity"/> </action_set> - <action_set description="Queste Abilità includono il potere di intestare, modificare, e vendere terreni di proprietà del Gruppo. Per aprire la finestra Info sul Terreno, click destro sulla terra e seleziona 'Info sul Terreno', o clicca l'icona 'i' sulla Barra di Navigazione." name="Parcel Management"> - <action description="Intestare terra e comprare terra per il gruppo" longdescription="Intesta terra e compra terra per il Gruppo. Viene fatto in Informazioni sul Terreno > tabella Generale." name="land deed"/> - <action description="Abbandonare la terra in favore di Governor Linden" longdescription="Abbandona la terra in favore di Governor Linden. *ATTENZIONE* Ogni Membro con questo Ruolo e Abilità può abbandonare la terra posseduta dal Gruppo in Informazioni sul Terreno > tabella Generale, restituendola alla proprietà Linden senza una vendita! Devi essere sicuro di quello che fai prima di assegnare questa Abilità." name="land release"/> - <action description="Impostare le info per la vendita della terra" longdescription="Imposta le info per la vendita della terra. *ATTENZIONE* Ogni Membro con questo Ruolo e Abilità può vendere la terra posseduta dal Gruppo in Info sul Terreno > tabella Generale (al prezzo che vogliono)! Devi essere sicuro di quello che fai prima di assegnare questa Abilità." name="land set sale info"/> - <action description="Suddividere e unire appezzamenti" longdescription="Suddividi e unisci parcel. Viene fatto con click destro sul terra, 'Modifica Terreno', trascinando poi il mouse sulla terra per creare una selezione. Per suddividere, seleziona quale parte vuoi dividere e clicca 'Suddividere'. Per unire, seleziona due o più two parcel confinanti e clicca 'Unisci'." name="land divide join"/> + <action_set description="Queste Abilità comprendono il potere di intestare, modificare e vendere terreni di proprietà del gruppo. Per aprire la finestra Informazioni sul terreno, fai clic con il pulsante destro del mouse sul terreno e seleziona Informazioni sul terreno, o clicca sull'icona 'i' nella Barra di Navigazione." name="Parcel Management"> + <action description="Cessione di terreno e acquisto di terreno per il gruppo" longdescription="Intesta terreno e acquista terreno per il gruppo. Ciò viene fatto in Informazioni sul terreno > scheda Generale." name="land deed"/> + <action description="Abbandonare il terreno in favore di Governor Linden" longdescription="Abbandona il terreno in favore di Governor Linden. *ATTENZIONE* Ogni membro con questo ruolo e abilità può abbandonare il terreno di proprietà del gruppo in Informazioni sul terreno > scheda Generale, restituendolo alla proprietà Linden senza effettuare una vendita. Sii sicuro della scelta prima di assegnare questa Abilità." name="land release"/> + <action description="Informazioni su come impostare il terreno come in vendita" longdescription="Imposta le info per la vendita della terra. *ATTENZIONE* Ogni Membro con questo ruolo e abilità può vendere il terreno di proprietà del gruppo nella scheda Informazioni sul terreno > scheda Generale. Pertanto sii sicuro della scelta prima di assegnare questa Abilità." name="land set sale info"/> + <action description="Suddividere e unire lotti" longdescription="Suddividi e unisci lotti. Viene fatto cliccando con il pulsante destro del mouse sul terreno, selezionando Modifica terreno e trascinando il mouse sul terreno per creare una selezione. Per suddividere, seleziona quale parte vuoi dividere e clicca su Suddividi. Per unire, seleziona due o più lotti confinanti e clicca su Unisci." name="land divide join"/> </action_set> - <action_set description="Queste Abilità permettono di cambiare il nome dell'appezzamento, le impostazioni pre-definite, la visibilità nella mappatura, il punto di arrivo & le coordinate del Teleport." name="Parcel Identity"> - <action description="Premi 'Mostra Luogo nel Cerca' e seleziona una categoria" longdescription="Premi 'Mostra Luogo nel Cerca' e seleziona una categoria di parcel in Info sul Terreno > tabella Opzioni." name="land find places"/> - <action description="Cambia il nome del parcel, descrizione, e impostazioni nel 'Mostra Luogo nel Cerca'" longdescription="Cambia il nome del parcel, descrizione, e impostazioni nel 'Mostra Luogo nel Cerca'. Viene fatto in Info sul Terreno > tabella Opzioni." name="land change identity"/> - <action description="Impostare il punto di arrivo e le coordinate del Teleport" longdescription="In un appezzamento posseduto da un Gruppo, i Membri con questo Ruolo e Abilità possono impostare un punto di arrivo per i Teleport entranti, e impostare anche le coordinate del Teleport per ulteriore precisione. Viene fatto in Informazioni sul Terreno > tabella Opzioni." name="land set landing point"/> + <action_set description="Queste abilità permettono di cambiare il nome del lotto, le impostazioni di pubblicazione, la visibilità negli elenchi e il punto di arrivo, nonché opzioni di indirizzamento del Teleport." name="Parcel Identity"> + <action description="Premi Mostra luogo nella ricerca e seleziona una categoria" longdescription="Premi Mostra luogo nella ricerca e seleziona una categoria di lotto in Informazioni sul terreno > scheda Opzioni." name="land find places"/> + <action description="Cambia il nome del lotto, la descrizione e le impostazioni di Mostra luogo nella ricerca" longdescription="Cambia il nome del lotto, la descrizione e le impostazioni di Mostra luogo nella ricerca. Ciò viene fatto in Informazioni sul terreno > scheda Opzioni." name="land change identity"/> + <action description="Impostare il punto di arrivo e l'indirizzamento del Teleport" longdescription="In un lotto di proprietà di un gruppo, i membri con questo ruolo e abilità possono impostare un punto di arrivo per i teleport entranti e impostare anche l'indirizzamento del teleport per ulteriore precisione. Viene fatto in Informazioni sul terreno > Opzioni." name="land set landing point"/> </action_set> - <action_set description="Queste Abilità permettono alcune permessi nell'appezzamento, quali 'Creare Oggetti', 'Editare il Terreno', trasmettere musica & tabella Media." name="Parcel Settings"> - <action description="Cambiare musica & tabella media" longdescription="Cambia le impostazioni per lo streaming della musica e dei video in Informazioni sul Terreno > tabella Media." name="land change media"/> - <action description="Cliccare 'Edita il Terreno'" longdescription="Clicca 'Edita il Terreno'. *ATTENZIONE* Informazioni sul Terreno > tabella Opzioni > Edita il Terreno permette a tutti di modificare la forma del terreno, collocare e spostare le piante Linden. Devi essere sicuro di quello che fai prima di assignera questa Abilità. Edita il terreno in Informazioni sul Terreno > tabella Opzioni." name="land edit"/> - <action description="Cliccare Informazioni sul Terreno > Impostazione Opzioni" longdescription="Premi 'Salvo (nessun danno)', 'Vola', e permetti agli altri Residenti di: 'modifica Terreno', 'Crea', 'Crea Landmarks', e 'Scripts attivi' nella terra posseduta da un Gruppo in Info sul Terreno > tabella Opzioni." name="land options"/> + <action_set description="Queste abilità hanno poteri relativi alle opzioni dei lotti, come la creazione di oggetti, la modifica del terreno e le impostazioni per la musica e gli elementi multimediali." name="Parcel Settings"> + <action description="Cambiare impostazioni musica e multimediali" longdescription="Cambia le impostazioni per lo streaming della musica e dei video in Informazioni sul terreno > Media." name="land change media"/> + <action description="Attiva 'Modifica terreno'" longdescription="Attiva 'Modifica terreno'. *ATTENZIONE* Informazioni sul terreno > Opzioni > Modifica terreno consente a chiunque di modificare la forma del tuo terreno e di collocare e spostare le piante Linden. Pertanto sii sicuro della scelta prima di assegnare questa Abilità. La funzione di modifica del terreno è attivata in Informazioni sul terreno > Opzioni." name="land edit"/> + <action description="Attivazione di parametri per Informazioni sul terreno > Opzioni" longdescription="Premi Sicuro (nessun danno), Vola e consenti agli altri residenti di: modificare il terreno, costruire, creare punti di riferimento ed eseguire script nel terreno appartenente ad un gruppo in Informazioni sul terreno > scheda Opzioni." name="land options"/> </action_set> - <action_set description="Queste Abilità permettono ai Membri di non avere restrizioni in un appezzamento posseduto da un Gruppo." name="Parcel Powers"> - <action description="Permettere sempre 'Edita il Terreno'" longdescription="I Membri con questo Ruolo e Abilità possono editare il terreno posseduto da un Gruppo, anche se non è selezionato in Informazioni sul Terreno > tabella Opzioni." name="land allow edit land"/> - <action description="Permettere Vola Sempre'" longdescription="I Membri con questo Ruolo e Abilità possono volare in un terreno posseduto da un Gruppo, anche se non è selezionato in Info sul Terreno > tabella Opzioni." name="land allow fly"/> - <action description="Permettere 'Crea Oggetti' sempre" longdescription="I Membri con questo Ruolo e Abilità possono creare oggetti in un appezzamento posseduto da un Gruppo, anche se non è selezionato in Informazioni sul Terreno > tabella Opzioni." name="land allow create"/> - <action description="Permettere 'Crea Landmark' sempre" longdescription="I Membri con questo Ruolo e Abilità possono creare Landmark in un appezzamento posseduto da un Gruppo , anche se non è evidenziato in Informazioni sul Terreno > tabella Opzioni." name="land allow landmark"/> - <action description="Permettere 'Teleportami a Casa' in un appezzamento di un Gruppo" longdescription="I Membri in un Ruolo con questa Abilità possono usare il menu Mondo > Landmarks > Imposta come Casa su un parcel intestato ad un Gruppo." name="land allow set home"/> + <action_set description="Queste abilità permettono ai membri di non avere restrizioni in un lotto appartenente ad un gruppo." name="Parcel Powers"> + <action description="Consenti sempre la modifica del terreno" longdescription="I membri con questo ruolo e abilità possono modificare il terreno appartenente ad un gruppo, anche se la funzionalità è disattivata in Informazioni sul terreno > Opzioni." name="land allow edit land"/> + <action description="Consenti sempre il volo" longdescription=" I membri con questo ruolo e abilità possono volare in un terreno appartenente ad un gruppo, anche se la funzionalità è disattivata in Informazioni sul terreno > Opzioni." name="land allow fly"/> + <action description="Consenti sempre la creazione di oggetti" longdescription="I membri con questo ruolo e abilità possono creare oggetti in un lotto appartenente ad un gruppo, anche se la funzionalità è disattivata in Informazioni sul terreno > Opzioni." name="land allow create"/> + <action description="Consenti sempre la creazione di punti di riferimento" longdescription="I membri con questo ruolo e abilità possono creare punti di riferimento in un lotto appartenente ad un gruppo, anche se la funzionalità è disattivata in Informazioni sul terreno > Opzioni." name="land allow landmark"/> + <action description="Consenti la funzione 'Imposta come Casa mia' in un lotto di gruppo" longdescription="I membri in un ruolo con questa Abilità possono usare il menu Mondo > Punti di riferimento > Imposta come Casa su un lotto ceduto a questo gruppo." name="land allow set home"/> </action_set> - <action_set description="Queste Abilità permettono di concedere o limitare l'accesso ad un appezzamento di un Gruppo, e includono Congela ed Espelli un Residente." name="Parcel Access"> - <action description="Gestire la lista degli Accessi Consentiti" longdescription="Gestisci la lista degli Accessi Consentiti in Informazioni sul Terreno > tabella Accesso." name="land manage allowed"/> - <action description="Gestire la lista degli Accessi Bloccati" longdescription="Gestisci la lista Espulsi dal parcel in Info sul Terreno > tabella Accesso." name="land manage banned"/> - <action description="Cambia le impostazioni del parcel in 'Vendi Pass a'" longdescription="Cambia le impostazioni 'Vendi Pass a' in Info sul Terreno > tabella Accesso." name="land manage passes"/> - <action description="Espellere e Congelare i Residenti in un appezzamento" longdescription="Membri in un Ruolo con questa Abilità possono occuparsi di un residente indesiderato in un parcel posseduto da un Gruppo, con click destro sul residente, selezionando 'Espelli' o 'Immobilizza'." name="land admin"/> + <action_set description="Queste Abilità consentono di concedere o limitare l'accesso ad un lotto di un gruppo da parte di residenti, con le azioni Congela ed Espelli." name="Parcel Access"> + <action description="Gestire la lista di accesso al lotto" longdescription="Gestisci la lista di accesso al lotto in Informazioni sul terreno > Accesso." name="land manage allowed"/> + <action description="Gestire la lista dei residenti espulsi dal lotto" longdescription="Gestisci la lista Espulsi dal lotto in Informazioni sul terreno > scheda Accesso." name="land manage banned"/> + <action description="Cambia le impostazioni del lotto in Vendi pass a" longdescription="Cambia le impostazioni Vendi pass a in Informazioni sul terreno > scheda Accesso." name="land manage passes"/> + <action description="Espellere e Congelare i Residenti in un lotto" longdescription="Membri in un ruolo con questa Abilità possono occuparsi di un residente indesiderato in un lotto posseduto da un gruppo, facendo clic sul residente con il pulsante destro del mouse e selezionando Espelli o Congela." name="land admin"/> </action_set> - <action_set description="Queste Abilità permettono ai Membri di restituire oggetti, collocare e spostare piante Linden. Questo è utile ai Membri per ripulire da oggetti indesiderati e creare paesaggi, ma deve essere utilizzato con cura, perchè non si può annullare la restituzione degli Oggetti." name="Parcel Content"> - <action description="Restituire oggetti posseduti da un Gruppo" longdescription="Restituisci gli oggetti posseduti da un Gruppo in un appezzamento di un Gruppo in Informazioni sul Terreno > tabella Oggetti." name="land return group owned"/> - <action description="Restituire oggetti concessi ad un Gruppo" longdescription="Restituisci oggetti concessi ad un Gruppo in un appezzamento di un Gruppo in Informazioni sul Terreno > tabella Oggetti." name="land return group set"/> - <action description="Restituire oggetti estranei al Gruppo" longdescription="Restituire oggetti estranei al Gruppo in un appezzamento di un Gruppo in Info sul Terreno > tabella Oggetti." name="land return non group"/> - <action description="Creare un paesaggio utilizzando le piante Linden" longdescription="Abilità di creare paesaggi di posizionare e spostare alberi, piante, erba. Questi oggetti sono presenti nella Libreria del tuo Inventario > Cartella Oggetti, o possono essere creati con il menu Crea." name="land gardening"/> + <action_set description="Queste abilità consentono ai membri di restituire oggetti, collocare e spostare piante Linden. Questo è utile ai membri per ripulire da oggetti indesiderati e creare paesaggi, ma deve essere utilizzato con cura, perchè la restituzione degli oggetti non può essere annullata." name="Parcel Content"> + <action description="Restituire oggetti di proprietà di un gruppo" longdescription="Restituisci gli oggetti di proprietà di un gruppo in un appezzamento di un gruppo in Informazioni sul terreno > Oggetti." name="land return group owned"/> + <action description="Restituire oggetti assegnati ad un gruppo" longdescription="Restituisci oggetti assegnati ad un gruppo in un lotto di un gruppo in Informazioni sul terreno > Oggetti." name="land return group set"/> + <action description="Restituire oggetti estranei al gruppo" longdescription="Restituire oggetti estranei al gruppo in un appezzamento di un gruppo in Informazioni sul terreno > Oggetti." name="land return non group"/> + <action description="Creare un paesaggio utilizzando le piante Linden" longdescription="Abilità di creare paesaggi e posizionare e spostare alberi, piante, erba Linden. Questi oggetti sono presenti nella Libreria del tuo Inventario > cartella Oggetti, o possono essere creati con il menu Crea." name="land gardening"/> </action_set> - <action_set description="Queste Abilità includono il potere di intestare, modificare, vendere oggetti posseduti dal gruppo. Viene fatto in Build Tools > tabella Generale. Click destro su un oggetto e Modifica per vedere le impostazioni." name="Object Management"> - <action description="Intestare oggetti ad un Gruppo" longdescription="Intesta oggetti ad un Gruppo in Build Tools > tabella Generale." name="object deed"/> - <action description="Modificare (sposta, copia, modifica) oggetti di un Gruppo" longdescription="Controlla (sposta, copia, modifica) gli oggetti posseduti da un Gruppo in Build Tools > tabella Generale." name="object manipulate"/> - <action description="Mettere in vendita oggetti di un Gruppo" longdescription="Metti in vendita oggetti posseduti da un Gruppo in Build Tools > tabelle Generale." name="object set sale"/> + <action_set description="Queste Abilità includono il potere di cedere, modificare e vendere oggetti posseduti dal gruppo. Viene fatto negli strumenti Costruisci > scheda Generale. Clic con il pulsante destro del mouse su un oggetto e Modifica per vedere le impostazioni." name="Object Management"> + <action description="Intestare oggetti ad un gruppo" longdescription="Intesta oggetti ad un gruppo in Strumenti per costruzione > scheda Generale." name="object deed"/> + <action description="Modificare (sposta, copia, modifica) oggetti di un gruppo" longdescription="Gestisci (sposta, copia, modifica) gli oggetti appartenenti ad un gruppo in Build Tools > tabella Generale." name="object manipulate"/> + <action description="Mettere in vendita oggetti di un gruppo" longdescription="Metti in vendita oggetti posseduti da un Gruppo in Strumenti per costruzione > scheda Generale." name="object set sale"/> </action_set> - <action_set description="Queste Abilità permettono di richiedere ai Membri di pagare le perdite del Gruppo e di ricevere i dividendi del Gruppo, e di limitare l'accesso all'account del Gruppo." name="Accounting"> - <action description="Pagare le perdite del Gruppo e ricevere i dividendi del Gruppo" longdescription="I Membri con questo Ruolo e Abilità pagheranno automaticamente le perdite del Gruppo e riceveranno i dividendi del Gruppo. Questo significa che riceveranno una porzione delle vendite di terre possedute dal gruppo (che sono risolte giornalmente), e contribuiranno anche su cose come le tasse di iscrizione dell'appezzament. " name="accounting accountable"/> + <action_set description="Queste abilità consentono di richiedere ai membri di pagare le passività del gruppo e di ricevere i dividendi del gruppo, nonché di limitare l'accesso alla cronologia finanziaria del gruppo." name="Accounting"> + <action description="Pagare le passività del gruppo e ricevere i dividendi del gruppo" longdescription="I membri con questo ruolo e abilità pagheranno automaticamente le passività del gruppo e riceveranno i dividendi del gruppo. Questo significa che riceveranno una porzione delle vendite di terreni appartenenti al gruppo (che sono distribuite giornalmente) e contribuiranno fondi a spese come le quote di inserzione del lotto. " name="accounting accountable"/> </action_set> - <action_set description="Queste Abilità permettono ai Membri di spedire, ricevere, e vedere le Notice del Gruppo." name="Notices"> - <action description="Spedire Notice" longdescription="Membri in un Ruolo con questa Abilità possono spedire Notice nel Gruppo > sezione Notice." name="notices send"/> - <action description="Ricevere Notice e vedere Notice precedenti" longdescription="Membri in un ruolo con questa Abilità possono ricevere Notice e vedere Notice vecchie nel Gruppo > sezione Notice." name="notices receive"/> + <action_set description="Queste abilità consentono ai membri di inviare, ricevere e vedere gli avvisi del gruppo." name="Notices"> + <action description="Invia avvisi" longdescription="Membri in un ruolo con questa Abilità possono inviare avvisi tramite la sezione Gruppo > Avvisi." name="notices send"/> + <action description="Ricevere avvisi e vedere avvisi precedenti" longdescription="Membri in un ruolo con questa Abilità possono ricevere avvisi e vedere avvisi precedenti nella sezione Gruppo > Avvisi." name="notices receive"/> </action_set> - <action_set description="Queste Abilità permettono di concedere o limitare l'accesso alle sessioni di chat e di voice chat nel gruppo." name="Chat"> - <action description="Aderire alla Chat di Gruppo" longdescription="I Membri con questo Ruolo e Abilità possono aderire alle sessioni di chat, sia scritte che in voice." name="join group chat"/> - <action description="Aderire alla Voice Chat di Gruppo" longdescription="I Membri con questo Ruolo e Abilità possono aderire alle sessioni di Voice Chat nel gruppo. NOTA: Per poter partecipare alla Chat di Gruppo è necessario accedere alla sessione di voice chat." name="join voice chat"/> - <action description="Moderare la Chat di Gruppo" longdescription="I Membri con questo Ruolo e Abilità possono controllare l'accesso e la partecipazione alle sessioni di chat scritta e di voice chat nel Gruppo." name="moderate group chat"/> + <action_set description="Queste Abilità permettono di concedere o limitare l'accesso alle sessioni di chat e di chat vocale nel gruppo." name="Chat"> + <action description="Partecipare alla Chat di gruppo" longdescription="I membri con questo ruolo e abilità possono partecipare alle sessioni di chat, sia scritte che vocale." name="join group chat"/> + <action description="Partecipa alla Chat vocale di gruppo" longdescription=" I membri con questo ruolo e abilità possono partecipare alle sessioni di Chat vocale nel gruppo. NOTA: per poter partecipare alla Chat di gruppo è necessario accedere alla sessione di chat vocale." name="join voice chat"/> + <action description="Moderare la Chat di gruppo" longdescription="I membri con questo ruolo e abilità possono gestire l'accesso e la partecipazione alle sessioni di chat scritta e di chat vocale nel gruppo." name="moderate group chat"/> </action_set> </role_actions> diff --git a/indra/newview/skins/default/xui/it/strings.xml b/indra/newview/skins/default/xui/it/strings.xml index 308d550188..93239983a8 100644 --- a/indra/newview/skins/default/xui/it/strings.xml +++ b/indra/newview/skins/default/xui/it/strings.xml @@ -999,7 +999,7 @@ Preferiti </string> <string name="InvFolder Current Outfit"> - Vestiario attuale + Abbigliamento attuale </string> <string name="InvFolder My Outfits"> Il mio vestiario diff --git a/indra/newview/skins/default/xui/pl/floater_about.xml b/indra/newview/skins/default/xui/pl/floater_about.xml index 93a87b8cbc..b49247c4bf 100644 --- a/indra/newview/skins/default/xui/pl/floater_about.xml +++ b/indra/newview/skins/default/xui/pl/floater_about.xml @@ -16,18 +16,18 @@ Procesor: [CPU] Pamięć: [MEMORY_MB] MB Wersja OS: [OS_VERSION] -Graphics Card Vendor: [GRAPHICS_CARD_VENDOR] -Karta Graficzna: [GRAPHICS_CARD] +Sprzedawca karty graficznej: [GRAPHICS_CARD_VENDOR] +Karta graficzna: [GRAPHICS_CARD] </floater.string> <floater.string name="AboutDriver"> - Windows Sterownik Karty Graficznej: [GRAPHICS_DRIVER_VERSION] + Windows Sterownik karty graficznej: [GRAPHICS_DRIVER_VERSION] </floater.string> <floater.string name="AboutLibs"> Wersja OpenGL: [OPENGL_VERSION] Wersja libcurl: [LIBCURL_VERSION] -Wersja Dekodera J2C: [J2C_VERSION] -Wersja Sterownika Audio: [AUDIO_DRIVER_VERSION] +Wersja dekodera J2C: [J2C_VERSION] +Wersja sterownika audio: [AUDIO_DRIVER_VERSION] Wersja Qt Webkit: [QT_WEBKIT_VERSION] Wersja Vivox: [VIVOX_VERSION] </floater.string> @@ -35,11 +35,11 @@ Wersja Vivox: [VIVOX_VERSION] (żadne) </floater.string> <floater.string name="AboutTraffic"> - Stracone Pakiety: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) + Stracone pakiety: [PACKETS_LOST,number,0]/[PACKETS_IN,number,0] ([PACKETS_PCT,number,1]%) </floater.string> <tab_container name="about_tab"> <panel label="Info" name="support_panel"> - <button label="Kopiuj do Schowka" name="copy_btn"/> + <button label="Kopiuj do schowka" name="copy_btn"/> </panel> <panel label="Podziękowania" name="credits_panel"> <text_editor name="credits_editor"> diff --git a/indra/newview/skins/default/xui/pl/floater_about_land.xml b/indra/newview/skins/default/xui/pl/floater_about_land.xml index 6f5cc18104..e4908deb07 100644 --- a/indra/newview/skins/default/xui/pl/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_about_land.xml @@ -24,7 +24,7 @@ <tab_container name="landtab"> <panel label="OGÓLNE" name="land_general_panel"> <panel.string name="new users only"> - Tylko Nowi Rezydenci + Tylko nowi Rezydenci </panel.string> <panel.string name="anyone"> Każdy @@ -39,7 +39,7 @@ Numer aukcji: [ID] </panel.string> <panel.string name="need_tier_to_modify"> - Musisz zaakceptować zakup by móc modyfikować posiadłość. + Musisz zaakceptować zakup by móc modyfikować Posiadłość. </panel.string> <panel.string name="group_owned_text"> (Własność Grupy) @@ -57,7 +57,7 @@ (brak) </panel.string> <panel.string name="sale_pending_text"> - (Sprzedaż w Toku Realizacji) + (Sprzedaż w toku realizacji) </panel.string> <panel.string name="no_selection_text"> Posiadłość nie wybrana. @@ -94,9 +94,9 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz Leyla Linden </text> <button label="Ustaw" name="Set..."/> - <check_box label="Udostępnij przypisywanie na grupę" name="check deed" tool_tip="Oficer grupy ma prawo przepisać prawo własności posiadłości na grupę. Posiadłość wspierana jest przez przydziały pochodzące od członków grupy."/> - <button label="Przypisz" name="Deed..." tool_tip="Prawo przypisania posiadłości na grupę może dokonać jedynie oficer grupy."/> - <check_box label="Właścicel dokonuje wpłat związanych z posiadłością" name="check contrib" tool_tip="Kiedy posiadłość zostaje przypisana na grupę, poprzedni właściciel realizuje wpłaty z nią związane w celu jej utrzymania."/> + <check_box label="Udostępnij przypisywanie na Grupę" name="check deed" tool_tip="Oficer Grupy ma prawo przepisać prawo własności Posiadłości na Grupę. Posiadłość wspierana jest przez przydziały pochodzące od członków Grupy."/> + <button label="Przypisz" name="Deed..." tool_tip="Prawo przypisania Posiadłości na Grupę może dokonać jedynie oficer Grupy."/> + <check_box label="Właścicel dokonuje wpłat związanych z Posiadłością" name="check contrib" tool_tip="Kiedy Posiadłość zostaje przypisana na Grupę, poprzedni Właściciel realizuje wpłaty z nią związane w celu jej utrzymania."/> <text name="For Sale:"> Na Sprzedaż: </text> @@ -104,9 +104,9 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz Nie </text> <text name="For Sale: Price L$[PRICE]."> - Cena: L$[PRICE] (L$[PRICE_PER_SQM]/m²). + Cena: [PRICE]L$ ([PRICE_PER_SQM]L$/m²). </text> - <button label="Sprzedaj Posiadłość" name="Sell Land..."/> + <button label="Sprzedaj posiadłość" name="Sell Land..."/> <text name="For sale to"> Na sprzedaż dla: [BUYER] </text> @@ -116,7 +116,7 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz <text name="Selling with no objects in parcel."> Obiekty nie są zawarte w sprzedaży. </text> - <button label="Anuluj Sprzedaż" label_selected="Anuluj Sprzedaż" name="Cancel Land Sale"/> + <button label="Anuluj sprzedaż" label_selected="Anuluj sprzedaż" name="Cancel Land Sale"/> <text name="Claimed:"> Data: </text> @@ -139,22 +139,22 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz <button label="Skrypt" name="Scripts..."/> <button label="Kup dla Grupy" name="Buy For Group..."/> <button label="Kup Przepustkę..." label_selected="Kup Przeputkę..." left="130" name="Buy Pass..." tool_tip="Przepustka udostępnia tymczasowy wstęp na posiadłość." width="125"/> - <button label="Porzuć z Posiadłości" name="Abandon Land..."/> + <button label="Porzuć Posiadłość" name="Abandon Land..."/> <button label="Odzyskaj Posiadłość" name="Reclaim Land..."/> - <button label="Sprzedaż przez Lindenów" name="Linden Sale..." tool_tip="Posiadłość musi mieć właściciela, zawartość oraz nie może być wystawiona na aukcę."/> + <button label="Sprzedaż przez Lindenów" name="Linden Sale..." tool_tip="Posiadłość musi mieć Właściciela, zawartość oraz nie może być wystawiona na Aukcję."/> </panel> <panel label="UMOWA" name="land_covenant_panel"> <panel.string name="can_resell"> - Posiadłość zakupiona w tym regionie może być odsprzedana. + Posiadłość zakupiona w tym Regionie może być odsprzedana. </panel.string> <panel.string name="can_not_resell"> - Posiadłość zakupiona w tym regionie nie może być odsprzedana. + Posiadłość zakupiona w tym Regionie nie może być odsprzedana. </panel.string> <panel.string name="can_change"> - Posiadłość zakupiona w tym regionie może być łączona/dzielona. + Posiadłość zakupiona w tym Regionie może być łączona/dzielona. </panel.string> <panel.string name="can_not_change"> - Posiadłość zakupiona w tym regionie nie może być + Posiadłość zakupiona w tym Regionie nie może być łączona/dzielona. </panel.string> <text name="estate_section_lbl"> @@ -197,13 +197,13 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz Odsprzedaj: </text> <text left="115" name="resellable_clause" width="338"> - Posiadłość zakupiona w tym regionie nie może być odsprzedana. + Posiadłość zakupiona w tym Regionie nie może być odsprzedana. </text> <text name="changeable_lbl"> Podziel: </text> <text left="115" name="changeable_clause" width="338"> - Posiadłość zakupiona w tym regionie nie może być + Posiadłość zakupiona w tym Regionie nie może być łączona/dzielona. </text> </panel> @@ -215,7 +215,7 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz [COUNT] z [MAX] ([DELETED] zostanie usunięte) </panel.string> <text name="parcel_object_bonus"> - Ilość Ekstra Obiektów: [BONUS] + Ilość ekstra obiektów: [BONUS] </text> <text name="Simulator primitive usage:"> Ilość używanych primów: @@ -230,19 +230,19 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz [COUNT] </text> <text name="Primitives on parcel:"> - Primy na posiadłości: + Primy na Posiadłości: </text> <text name="total_objects_text"> [COUNT] </text> <text name="Owned by parcel owner:"> - Właściciela posiadłości: + Właściciela Posiadłości: </text> <text name="owner_objects_text"> [COUNT] </text> <button label="Pokaż" label_selected="Pokaż" name="ShowOwner"/> - <button label="Zwróć" name="ReturnOwner..." tool_tip="Zwróć obiekty do ich właścicieli."/> + <button label="Zwróć" name="ReturnOwner..." tool_tip="Zwróć obiekty do ich Właścicieli."/> <text name="Set to group:"> Grupy: </text> @@ -250,7 +250,7 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz [COUNT] </text> <button label="Pokaż" label_selected="Pokaż" name="ShowGroup"/> - <button label="Zwróć" name="ReturnGroup..." tool_tip="Zwróć obiekty do ich właścicieli.."/> + <button label="Zwróć" name="ReturnGroup..." tool_tip="Zwróć obiekty do ich Właścicieli.."/> <text name="Owned by others:"> Innych Rezydentów: </text> @@ -258,7 +258,7 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz [COUNT] </text> <button label="Pokaż" label_selected="Pokaż" name="ShowOther"/> - <button label="Zwróć" name="ReturnOther..." tool_tip="Zwróć obiekty do ich właścicieli."/> + <button label="Zwróć" name="ReturnOther..." tool_tip="Zwróć obiekty do ich Właścicieli."/> <text name="Selected / sat upon:"> Wybranych: </text> @@ -269,9 +269,9 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz Zwracaj obiekty innych Rezydentów (minut, 0 = wyłącz): </text> <text name="Object Owners:" width="108"> - Właściciel Obiektów: + Właściciel obiektów: </text> - <button label="Odśwież Listę" label_selected="Odśwież Listę" left="112" name="Refresh List" tool_tip="Refresh Object List"/> + <button label="Odśwież listę" label_selected="Odśwież listę" left="112" name="Refresh List" tool_tip="Refresh Object List"/> <button label="Zwróć obiekty..." label_selected="Zwróć obiekty..." left="224" name="Return objects..."/> <name_list name="owner list"> <name_list.columns label="Typ" name="type"/> @@ -283,14 +283,14 @@ Idź do Świat > O Posiadłości albo wybierz inną posiadłość żeby pokaz </panel> <panel label="OPCJE" name="land_options_panel"> <panel.string name="search_enabled_tooltip"> - Udostępnij wyświetlanie tej posiadłości w wyszukiwarce + Udostępnij wyświetlanie tej Posiadłości w wyszukiwarce </panel.string> <panel.string name="search_disabled_small_tooltip"> - Wybrana opcja jest wyłączona ze względu iż wielkość posiadłości wynosi 128 m² bądź mniej. + Wybrana opcja jest wyłączona, ponieważ wielkość Posiadłości wynosi 128 m² bądź mniej. Jedynie większe posiadłości mogą być umieszczone w bazie wyszukiwarki. </panel.string> <panel.string name="search_disabled_permissions_tooltip"> - Wybrana opcja jest wyłączona ponieważ nie posiadasz prawa do modyfikacji posiadłości. + Wybrana opcja jest wyłączona ponieważ nie posiadasz prawa do modyfikacji Posiadłości. </panel.string> <panel.string name="mature_check_mature"> Treść 'Mature' @@ -299,10 +299,10 @@ Jedynie większe posiadłości mogą być umieszczone w bazie wyszukiwarki. Treść 'Adult' </panel.string> <panel.string name="mature_check_mature_tooltip"> - Twoja posiadłość bądź treść jaką zawiera klasyfikowana jest jako 'Mature'. + Twoja Posiadłość bądź treść jaką zawiera klasyfikowana jest jako 'Mature'. </panel.string> <panel.string name="mature_check_adult_tooltip"> - Informacje o Twojej posiadłości i treści jaką zawiera klasyfikowane są jako 'Adult'. + Informacje o Twojej Posiadłości i treści jaką zawiera klasyfikowane są jako 'Adult'. </panel.string> <panel.string name="landing_point_none"> (brak) @@ -316,8 +316,8 @@ Jedynie większe posiadłości mogą być umieszczone w bazie wyszukiwarki. <text name="allow_label"> Udostępnij innym Rezydentom: </text> - <check_box label="Edytowanie Terenu" name="edit land check" tool_tip="Wybrana - każdy może kształtować Twój teren. Najlepiej jest zostawić tą opcję nie wybraną, Ty zawsze możesz kształtowć Twój teren."/> - <check_box label="Latanie" name="check fly" tool_tip="Wybrana - Rezydenci mogą latać na Twojej posiadłości. Nie wybrana - mogą tylko wlatywać do lub latać ponad Twoją posiadłością."/> + <check_box label="Edytowanie Terenu" name="edit land check" tool_tip="Wybrana - każdy może kształtować Twój teren. Najlepiej jest zostawić tą opcję nie wybraną, Ty zawsze możesz kształtować Twój teren."/> + <check_box label="Latanie" name="check fly" tool_tip="Wybrana - Rezydenci mogą latać na Twojej Posiadłości. Nie jest wybrana - mogą tylko wlatywać do lub latać ponad Twoją Posiadłością."/> <text name="allow_label2"> Budowanie: </text> @@ -336,34 +336,34 @@ Jedynie większe posiadłości mogą być umieszczone w bazie wyszukiwarki. <text name="land_options_label"> Opcje Posiadłości: </text> - <check_box label="Bezpieczna (brak zniszczeń)" name="check safe" tool_tip="Wybrana - posiadłość jest bezpieczna - zniszczenia w walce są zablokowane. Nie wybrana - zniszczenia w walce są włączone."/> - <check_box label="Popychanie niedozwolone" name="PushRestrictCheck" tool_tip="Nie pozwalaj skryptom na popychanie. Wybranie tej opcji może być przydatne do ograniczenia zakłóceń spokoju w Twojej posiadłości."/> - <check_box label="Wyświetlaj w wyszukiwarce (30L$/tyg.)" name="ShowDirectoryCheck" tool_tip="Udostępnij ukazywanie się nazwy posiadłości w wyszukiwarce"/> + <check_box label="Bezpieczna (brak zniszczeń)" name="check safe" tool_tip="Wybrana - Posiadłość jest bezpieczna - zniszczenia w walce są zablokowane. Nie jest wybrana - zniszczenia w walce są włączone."/> + <check_box label="Popychanie niedozwolone" name="PushRestrictCheck" tool_tip="Nie pozwalaj skryptom na popychanie. Wybranie tej opcji może być przydatne do ograniczenia zakłóceń spokoju w Twojej Posiadłości."/> + <check_box label="Wyświetlaj w wyszukiwarce (30L$/tyg.)" name="ShowDirectoryCheck" tool_tip="Udostępnij ukazywanie się nazwy Posiadłości w wyszukiwarce"/> <combo_box name="land category with adult"> - <combo_box.item label="Każda Kategoria" name="item0"/> - <combo_box.item label="Linden Lokacja" name="item1"/> + <combo_box.item label="Każda kategoria" name="item0"/> + <combo_box.item label="Linden Lokalizacja" name="item1"/> <combo_box.item label="'Adult'" name="item2"/> - <combo_box.item label="Sztuka i Kultura" name="item3"/> + <combo_box.item label="Sztuka i kultura" name="item3"/> <combo_box.item label="Biznes" name="item4"/> <combo_box.item label="Edukacyjna" name="item5"/> <combo_box.item label="Gra" name="item6"/> <combo_box.item label="Poznawanie ludzi" name="item7"/> <combo_box.item label="Przyjazne dla nowych" name="item8"/> - <combo_box.item label="Park i Natura" name="item9"/> + <combo_box.item label="Park i natura" name="item9"/> <combo_box.item label="Mieszkalna" name="item10"/> <combo_box.item label="Zakupy" name="item11"/> <combo_box.item label="Inna" name="item12"/> </combo_box> <combo_box name="land category"> - <combo_box.item label="Każda Kategoria" name="item0"/> - <combo_box.item label="Linden Lokacja" name="item1"/> - <combo_box.item label="Sztuka i Kultura" name="item3"/> + <combo_box.item label="Każda kategoria" name="item0"/> + <combo_box.item label="Linden Lokalizacja" name="item1"/> + <combo_box.item label="Sztuka i kultura" name="item3"/> <combo_box.item label="Biznes" name="item4"/> <combo_box.item label="Edukacyjna" name="item5"/> <combo_box.item label="Gra" name="item6"/> <combo_box.item label="Poznawanie ludzi" name="item7"/> <combo_box.item label="Przyjazna dla nowych" name="item8"/> - <combo_box.item label="Parki i Natura" name="item9"/> + <combo_box.item label="Parki i natura" name="item9"/> <combo_box.item label="Mieszkalna" name="item10"/> <combo_box.item label="Zakupy" name="item11"/> <combo_box.item label="Inna" name="item12"/> @@ -379,9 +379,9 @@ Jedynie większe posiadłości mogą być umieszczone w bazie wyszukiwarki. <button label="Ustaw" label_selected="Ustaw" name="Set" tool_tip="Ustal miejsce lądowania dla przybywających gości. Używa położenia Twojego awatara na tej posiadłości."/> <button label="Nowy" label_selected="Nowy" name="Clear" tool_tip="Clear the landing point."/> <text name="Teleport Routing: "> - Trasa Teleportacji: + Trasa teleportacji: </text> - <combo_box name="landing type" tool_tip="Trasa Teleportacj-ustaw w jaki sposób będzie sę odbywać proces telportacji w posiadłości."> + <combo_box name="landing type" tool_tip="Trasa teleportacj-ustaw w jaki sposób będzie sę odbywać proces telportacji w Posiadłości."> <combo_box.item label="Zablokowana" name="Blocked"/> <combo_box.item label="Punkt Lądowania" name="LandingPoint"/> <combo_box.item label="Gdziekolwiek" name="Anywhere"/> @@ -389,14 +389,14 @@ Jedynie większe posiadłości mogą być umieszczone w bazie wyszukiwarki. </panel> <panel label="MEDIA" name="land_media_panel"> <text name="with media:"> - Typ Mediów: + Typ mediów: </text> <combo_box name="media type" tool_tip=""/> <text name="at URL:"> - URL Mediów: + URL mediów: </text> <button label="Ustaw" name="set_media_url"/> - <check_box label="Ukryj URL Mediów" name="hide_media_url" tool_tip="Wybranie tej opcji, zablokuje widok adresu do medów wszystkim nieautoryzowanym użytkownikom. Nie dotyczy to jednak typów HTML."/> + <check_box label="Ukryj URL mediów" name="hide_media_url" tool_tip="Wybranie tej opcji, zablokuje widok adresu do medów wszystkim nieautoryzowanym Użytkownikom. Nie dotyczy to jednak typów HTML."/> <text name="Description:"> Opis: </text> @@ -425,9 +425,9 @@ Mediów: <check_box label="Powtórka Odtwarzania" name="media_loop" tool_tip="Odtwarzaj media z powtórką. Po wyświetleniu materialu, rozpocznie się odtwarzanie od początku."/> </panel> <panel label="DŹWIĘK" name="land_audio_panel"> - <check_box label="Ukryj URL Muzyki" name="hide_music_url" tool_tip="Wybranie tej opcji, zablokuje widok adresu do medów muzycznych w posiadłości wszystkim nieautoryzowanym użytkownikom"/> - <check_box label="Rozmowy Dozwolone" name="parcel_enable_voice_channel"/> - <check_box label="Rozmowy Dozwolone (ustawione przez Majątek)" name="parcel_enable_voice_channel_is_estate_disabled"/> + <check_box label="Ukryj URL muzyki" name="hide_music_url" tool_tip="Wybranie tej opcji, zablokuje widok adresu do medów muzycznych w posiadłości wszystkim nieautoryzowanym Użytkownikom"/> + <check_box label="Rozmowy dozwolone" name="parcel_enable_voice_channel"/> + <check_box label="Rozmowy dozwolone (ustawione przez Majątek)" name="parcel_enable_voice_channel_is_estate_disabled"/> <check_box label="Ogranicz komunikację głosową w tej posiadłości." name="parcel_enable_voice_channel_local"/> </panel> <panel label="DOSTĘP" name="land_access_panel"> @@ -438,19 +438,19 @@ Mediów: Udostępnij dostęp publiczny ([MATURITY]) </panel.string> <panel.string name="estate_override"> - Jedna lub więcej z tych opcji ustawiona jest z poziomu posiadłości + Jedna lub więcej z tych opcji ustawiona jest z poziomu Posiadłości </panel.string> <text name="Limit access to this parcel to:"> - Dostęp do tej posiadłości: + Dostęp do tej Posiadłości: </text> <check_box label="Publiczny [MATURITY]" name="public_access"/> <text name="Only Allow"> Zablokuj dostęp dla: </text> <check_box label="Rezydentów zarejestrowanych w systemie płatniczym Linden Lab [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Zbanuj Rezydentów niezarejestrowanych w systemie płatniczym z Linden Lab."/> - <check_box label="Weryfikacja Wieku: [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Zbanuj Rezydetów bez weryfikacji wieku. Odwiedź support.secondlife.com po więcej informacji."/> - <check_box label="Udostępnij wejście grupie: [GROUP]" name="GroupCheck" tool_tip="Ustaw grupę w głównej zakładce"/> - <check_box label="Sprzedaj wejściówki:" name="PassCheck" tool_tip="Otwórz tymczasowy dostęp do tej posiadłości"/> + <check_box label="Weryfikacja Wieku: [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Zbanuj Rezydetów bez Weryfikacji Wieku. Odwiedź support.secondlife.com po więcej informacji."/> + <check_box label="Udostępnij wejście Grupie: [GROUP]" name="GroupCheck" tool_tip="Ustaw Grupę w głównej zakładce"/> + <check_box label="Sprzedaj przepustki:" name="PassCheck" tool_tip="Otwórz tymczasowy dostęp do tej Posiadłości"/> <combo_box name="pass_combo"> <combo_box.item label="Każdemu" name="Anyone"/> <combo_box.item label="Grupie" name="Group"/> diff --git a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml index b8eea31e29..ca06665c65 100644 --- a/indra/newview/skins/default/xui/pl/floater_animation_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_animation_preview.xml @@ -9,7 +9,7 @@ Maksymalna długość pliku animacji wynosi [MAX_LENGTH] sekund. </floater.string> <floater.string name="failed_file_read"> - Niemożliwość odczytania pliku animacji do wyświetlenia. + Brak możliwości odczytania plików animacji do wyświetlenia. [STATUS] </floater.string> @@ -62,25 +62,25 @@ Maksymalna długość pliku animacji wynosi [MAX_LENGTH] sekund. Nie można odczytać wartości obrotu. </floater.string> <floater.string name="E_ST_NO_XLT_FILE"> - Niemożliwość otworzenia pliku tłumaczenia. + Nie można otworzyć pliku tłumaczenia. </floater.string> <floater.string name="E_ST_NO_XLT_HEADER"> - Niemożliwość przeczytania tłumaczenia nagłówka. + Nie można przeczytać tłumaczenia nagłówka. </floater.string> <floater.string name="E_ST_NO_XLT_NAME"> - Niemożliwość przeczytania nazw tłumaczenia. + Nie można przetłumaczyć nazw. </floater.string> <floater.string name="E_ST_NO_XLT_IGNORE"> - Niemożliwość przeczytania tłumaczenia dla wartości ignorowania. + Nie można przeczytać tłumaczenia dla wartości ignorowania. </floater.string> <floater.string name="E_ST_NO_XLT_RELATIVE"> - Niemożliwość przeczytania tłumaczenia wartości relatywnej. + Nie można przeczytać tłumaczenia wartości relatywnej. </floater.string> <floater.string name="E_ST_NO_XLT_OUTNAME"> - Niemożliwość przeczytania nazw wartości tłumaczenia. + Nie można przeczytać nazw wartości tłumaczenia. </floater.string> <floater.string name="E_ST_NO_XLT_MATRIX"> - Niemożliwość przeczytania tłumaczenia pola. + Nie można przeczytać tłumaczenia pola. </floater.string> <floater.string name="E_ST_NO_XLT_MERGECHILD"> Brak otrzymania nazwy dla mergechild. @@ -115,7 +115,7 @@ Maksymalna długość pliku animacji wynosi [MAX_LENGTH] sekund. <text name="description_label"> Opis: </text> - <spinner label="Pierwszeństwo" name="priority" tool_tip="Kontroluj,animacje,które mogą zostać zdominowane przez tą animację"/> + <spinner label="Pierwszeństwo" name="priority" tool_tip="Kontroluj animacje,które mogą zostać zdominowane przez tą animację"/> <check_box label="Powtarzaj" name="loop_check" tool_tip="Powtarzaj tą animację"/> <spinner label="Od(%)" name="loop_in_point" tool_tip="Wybierz punkt, od którego chcesz zacząć powtarzać animację"/> <spinner label="Do(%)" name="loop_out_point" tool_tip="Wybierz punkt, od którego chcesz zakończyć powtarzanie animacji"/> @@ -182,6 +182,6 @@ Maksymalna długość pliku animacji wynosi [MAX_LENGTH] sekund. Doradzamy eksport plików BVH z Poser 4. </text> - <button label="Załaduj (L$[AMOUNT])" name="ok_btn"/> + <button label="Załaduj ([AMOUNT]L$)" name="ok_btn"/> <button label="Anuluj" name="cancel_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_auction.xml b/indra/newview/skins/default/xui/pl/floater_auction.xml index 815c36606c..9399fa1115 100644 --- a/indra/newview/skins/default/xui/pl/floater_auction.xml +++ b/indra/newview/skins/default/xui/pl/floater_auction.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_auction" title="ROZPOCZNIJ SPRZEDAŻ POSIADŁOŚCI LINDENÓW"> <floater.string name="already for sale"> - Nie możesz umieścić posiadłości na aukcji, jeżeli już została wystawiona na sprzedaż. + Nie możesz umieścić Posiadłości na Aukcji, jeżeli już została wystawiona na sprzedaż. </floater.string> <check_box initial_value="true" label="Zawierając żółte ogrodzenie" name="fence_check"/> <button label="Zdjęce" label_selected="Zdjęce" name="snapshot_btn"/> - <button label="Sprzedaj Każdemu" label_selected="Sprzedaj Każdemu" name="sell_to_anyone_btn"/> - <button label="Wyczyść Ustawienia" label_selected="Wyczyść Ustawienia" name="reset_parcel_btn"/> + <button label="Sprzedaj każdemu" label_selected="Sprzedaj Każdemu" name="sell_to_anyone_btn"/> + <button label="Wyczyść ustawienia" label_selected="Wyczyść ustawienia" name="reset_parcel_btn"/> <button label="Rozpocznij Aukcję" label_selected="Rozpocznij Aukcję" name="start_auction_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml index b42464d212..11651ad7e8 100644 --- a/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml +++ b/indra/newview/skins/default/xui/pl/floater_avatar_textures.xml @@ -4,38 +4,38 @@ NIEWŁAŚCIWY AWATAR </floater.string> <text name="composite_label"> - Tekstury Kompozytowe + Tekstury kompozytowe </text> <button label="Zrzuć" label_selected="Zrzuć" name="Dump"/> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> <texture_picker label="Włosy" name="hair-baked"/> <texture_picker label="Włosy" name="hair_grain"/> - <texture_picker label="Alpha Włosów" name="hair_alpha"/> + <texture_picker label="Alpha włosów" name="hair_alpha"/> <texture_picker label="Głowa" name="head-baked"/> <texture_picker label="Makijaż" name="head_bodypaint"/> - <texture_picker label="Alpha Głowy" name="head_alpha"/> - <texture_picker label="Tatuaż Głowy" name="head_tattoo"/> + <texture_picker label="Alpha głowy" name="head_alpha"/> + <texture_picker label="Tatuaż głowy" name="head_tattoo"/> <texture_picker label="Oczy" name="eyes-baked"/> <texture_picker label="Oko" name="eyes_iris"/> - <texture_picker label="Alpha Oczu" name="eyes_alpha"/> - <texture_picker label="Górna Część Ciała" name="upper-baked"/> - <texture_picker label="Górny Wzór na Ciele" name="upper_bodypaint"/> + <texture_picker label="Alpha oczu" name="eyes_alpha"/> + <texture_picker label="Górna część ciała" name="upper-baked"/> + <texture_picker label="Górny wzór na ciele" name="upper_bodypaint"/> <texture_picker label="Podkoszulek" name="upper_undershirt"/> <texture_picker label="Rękawiczki" name="upper_gloves"/> <texture_picker label="Koszula" name="upper_shirt"/> - <texture_picker label="Kurtka Górna" name="upper_jacket"/> - <texture_picker label="Alpha Górna" name="upper_alpha"/> - <texture_picker label="Tatuaż Górny" name="upper_tattoo"/> - <texture_picker label="Dolna Część Ciała" name="lower-baked"/> - <texture_picker label="Dolny Wzór na Ciele" name="lower_bodypaint"/> + <texture_picker label="Kurtka górna" name="upper_jacket"/> + <texture_picker label="Alpha górna" name="upper_alpha"/> + <texture_picker label="Tatuaż górny" name="upper_tattoo"/> + <texture_picker label="Dolna część ciała" name="lower-baked"/> + <texture_picker label="Dolny wzór na ciele" name="lower_bodypaint"/> <texture_picker label="Bielizna" name="lower_underpants"/> <texture_picker label="Skarpetki" name="lower_socks"/> <texture_picker label="Buty" name="lower_shoes"/> <texture_picker label="Spodnie" name="lower_pants"/> <texture_picker label="Kurtka" name="lower_jacket"/> - <texture_picker label="Alpha Dolna" name="lower_alpha"/> - <texture_picker label="Tatuaż Dolny" name="lower_tattoo"/> + <texture_picker label="Alpha dolna" name="lower_alpha"/> + <texture_picker label="Tatuaż dolny" name="lower_tattoo"/> <texture_picker label="Spódnica" name="skirt-baked"/> <texture_picker label="Spódnica" name="skirt"/> </panel> diff --git a/indra/newview/skins/default/xui/pl/floater_beacons.xml b/indra/newview/skins/default/xui/pl/floater_beacons.xml index 5bb469c433..547db2b351 100644 --- a/indra/newview/skins/default/xui/pl/floater_beacons.xml +++ b/indra/newview/skins/default/xui/pl/floater_beacons.xml @@ -2,20 +2,20 @@ <floater name="beacons" title="EMITERY"> <panel name="beacons_panel"> <text name="label_show"> - Pokaż Emitery: + Pokaż emitery: </text> <check_box label="Emitery" name="beacons"/> - <check_box label="Podkreśl Emitery" name="highlights"/> - <text name="beacon_width_label" tool_tip="Zasięg Emiterów"> + <check_box label="Podkreśl emitery" name="highlights"/> + <text name="beacon_width_label" tool_tip="Zasięg emiterów"> Szer. </text> <text name="label_objects"> Dla tych obiektów: </text> - <check_box label="Obiekty Fizyczne" name="physical"/> - <check_box label="Obiekty Skryptowane" name="scripted"/> - <check_box label="Obiekty Dotykalne" name="touch_only"/> - <check_box label="Źródła Dźwięku" name="sounds"/> - <check_box label="Źródła Cząsteczek" name="particles"/> + <check_box label="Obiekty fizyczne" name="physical"/> + <check_box label="Obiekty skryptowane" name="scripted"/> + <check_box label="Obiekty dotykalne" name="touch_only"/> + <check_box label="Źródła dźwięku" name="sounds"/> + <check_box label="Źródła cząsteczek" name="particles"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_build_options.xml b/indra/newview/skins/default/xui/pl/floater_build_options.xml index 8e9ae36c05..5d296aa725 100644 --- a/indra/newview/skins/default/xui/pl/floater_build_options.xml +++ b/indra/newview/skins/default/xui/pl/floater_build_options.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="build options floater" title="OPCJE SIATKI"> - <spinner label="Jednostki Siatki (metery)" name="GridResolution"/> - <spinner label="Rozmiary Siatki (metry)" name="GridDrawSize"/> + <spinner label="Jednostki siatki (metery)" name="GridResolution"/> + <spinner label="Rozmiary siatki (metry)" name="GridDrawSize"/> <check_box label="Pokaż podjednostki" name="GridSubUnit"/> - <check_box label="Pokaż Przekroje" name="GridCrossSection"/> - <text name="grid_opacity_label" tool_tip="Nieprzeźroczystość Siatki:"> + <check_box label="Pokaż przekroje" name="GridCrossSection"/> + <text name="grid_opacity_label" tool_tip="Nieprzeźroczystość siatki:"> Nieprzeźroczystość: </text> - <slider label="Nieprzezroczystość Siatki" name="GridOpacity"/> + <slider label="Nieprzezroczystość siatki" name="GridOpacity"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml b/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml index 4b6e8f793b..f4721b05d8 100644 --- a/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/pl/floater_bulk_perms.xml @@ -14,7 +14,7 @@ </floater.string> <check_box label="Animacje" name="check_animation"/> <icon name="icon_animation" tool_tip="Animacja"/> - <check_box label="Części Ciała" name="check_bodypart"/> + <check_box label="Części ciała" name="check_bodypart"/> <icon name="icon_bodypart" tool_tip="Części Ciała"/> <check_box label="Ubranie" name="check_clothing"/> <icon name="icon_clothing" tool_tip="Ubranie"/> @@ -44,7 +44,7 @@ </text> <check_box label="Kopiuj" name="everyone_copy"/> <text name="NextOwnerLabel"> - Następny właściciel: + Następny Właściciel: </text> <check_box label="Modyfikuje" name="next_owner_modify"/> <check_box label="Kopiuje" name="next_owner_copy"/> diff --git a/indra/newview/skins/default/xui/pl/floater_buy_contents.xml b/indra/newview/skins/default/xui/pl/floater_buy_contents.xml index dacd2c2376..94f2b50450 100644 --- a/indra/newview/skins/default/xui/pl/floater_buy_contents.xml +++ b/indra/newview/skins/default/xui/pl/floater_buy_contents.xml @@ -4,7 +4,7 @@ [NAME] zawiera: </text> <text name="buy_text"> - Kupić za L$[AMOUNT] od [NAME]? + Kupić za [AMOUNT]L$ od [NAME]? </text> <button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/> <button label="Kup" label_selected="Kup" name="buy_btn"/> diff --git a/indra/newview/skins/default/xui/pl/floater_buy_currency.xml b/indra/newview/skins/default/xui/pl/floater_buy_currency.xml index d8e53ee37a..f2a6579dc3 100644 --- a/indra/newview/skins/default/xui/pl/floater_buy_currency.xml +++ b/indra/newview/skins/default/xui/pl/floater_buy_currency.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="buy currency" title="KUP L$"> <floater.string name="buy_currency"> - Kup L$ [LINDENS] za [LOCALAMOUNT] + Kup [LINDENS] L$ za [LOCALAMOUNT] </floater.string> <text name="info_need_more"> Potrzebujesz więcej L$ @@ -10,7 +10,7 @@ Kontaktowanie z LindeX... </text> <text name="info_buying"> - kup L$ + Kup L$ </text> <text name="balance_label"> Obecnie posiadasz @@ -46,7 +46,7 @@ [AMT]L$ </text> <text name="currency_links"> - [http://www.secondlife.com/my/account/payment_method_management.php payment method] | [http://www.secondlife.com/my/account/currency.php currency] | [http://www.secondlife.com/my/account/exchange_rates.php exchange rate] + [http://www.secondlife.com/my/account/payment_method_management.php metoda płatności] | [http://www.secondlife.com/my/account/currency.php waluta] | [http://www.secondlife.com/my/account/exchange_rates.php kurs wymiany] </text> <text name="exchange_rate_note"> Wpisz ponownie kwotę aby zobaczyć ostatni kurs wymiany. diff --git a/indra/newview/skins/default/xui/pl/floater_buy_land.xml b/indra/newview/skins/default/xui/pl/floater_buy_land.xml index daafd14e1f..3d01129d9b 100644 --- a/indra/newview/skins/default/xui/pl/floater_buy_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_buy_land.xml @@ -35,14 +35,14 @@ Spróbuj wybrać mniejszy obszar. Ta Posiadłość już należy do Ciebie. </floater.string> <floater.string name="set_to_sell_to_other"> - Wybrana Posiadłość będzie sprzedana komu innemu. + Wybrana Posiadłość będzie sprzedana komuś innemu. </floater.string> <floater.string name="no_public_land"> Wybrany obszar nie ma publicznych Posiadłości. </floater.string> <floater.string name="not_owned_by_you"> - Wybrałeś posiadłość, której właścicielem jest inny Rezydent. -Spróbuj wybrać ponownie mniejszą powierzchnię posiadłości. + Wybrałeś Posiadłość, której Właścicielem jest inny Rezydent. +Spróbuj wybrać ponownie mniejszą powierzchnię Posiadłości. </floater.string> <floater.string name="processing"> Przetwarzanie Twojego zakupu... @@ -56,7 +56,7 @@ Spróbuj wybrać ponownie mniejszą powierzchnię posiadłości. Zakup tej Posiadłości spowoduje: </floater.string> <floater.string name="buying_for_group"> - Zakup ziemi dla grupy: + Zakup ziemi dla Grupy: </floater.string> <floater.string name="cannot_buy_now"> Nie możesz teraz kupić: @@ -123,7 +123,7 @@ używanie Posiadłości żeby sfinalizować ten zakup. Musisz dokupić [AMOUNT]L$ żeby kupić tą Posiadłość. </floater.string> <floater.string name="no_parcel_selected"> - (Posiadłość nie wybrana) + (Posiadłość nie została wybrana) </floater.string> <floater.string name="icon_PG" value="Parcel_PG_Dark"/> <floater.string name="icon_M" value="Parcel_M_Dark"/> diff --git a/indra/newview/skins/default/xui/pl/floater_camera.xml b/indra/newview/skins/default/xui/pl/floater_camera.xml index 4de00e39f3..aec75f026f 100644 --- a/indra/newview/skins/default/xui/pl/floater_camera.xml +++ b/indra/newview/skins/default/xui/pl/floater_camera.xml @@ -28,16 +28,16 @@ </panel> <joystick_rotate name="cam_rotate_stick" tool_tip="Obracaj kamerę wokoł osi"/> <panel name="camera_presets"> - <button name="rear_view" tool_tip="Widok z Tyłu"/> + <button name="rear_view" tool_tip="Widok z tyłu"/> <button name="group_view" tool_tip="Podgląd Grupy"/> - <button name="front_view" tool_tip="Widok z Przodu"/> - <button name="mouselook_view" tool_tip="Widok Panoramiczny"/> + <button name="front_view" tool_tip="Widok z przodu"/> + <button name="mouselook_view" tool_tip="Widok panoramiczny"/> </panel> </panel> <panel name="buttons"> - <button label="" name="orbit_btn" tool_tip="Obracaj Kamerę"/> - <button label="" name="pan_btn" tool_tip="Kamera Horyzontalna"/> + <button label="" name="orbit_btn" tool_tip="Obracaj kamerę"/> + <button label="" name="pan_btn" tool_tip="Kamera horyzontalna"/> <button label="" name="avatarview_btn" tool_tip="Ustawienia"/> - <button label="" name="freecamera_btn" tool_tip="Podgląd Obiektu"/> + <button label="" name="freecamera_btn" tool_tip="Podgląd obiektu"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_choose_group.xml b/indra/newview/skins/default/xui/pl/floater_choose_group.xml index 1e89b8bafc..877cedc0bc 100644 --- a/indra/newview/skins/default/xui/pl/floater_choose_group.xml +++ b/indra/newview/skins/default/xui/pl/floater_choose_group.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="groups" title="GRUPY"> <text name="groupdesc"> - Wybierz grupę: + Wybierz Grupę: </text> <button label="OK" label_selected="OK" name="OK"/> <button label="Anuluj" label_selected="Anuluj" name="Cancel"/> diff --git a/indra/newview/skins/default/xui/pl/floater_color_picker.xml b/indra/newview/skins/default/xui/pl/floater_color_picker.xml index 2246bf9ede..a607ca982f 100644 --- a/indra/newview/skins/default/xui/pl/floater_color_picker.xml +++ b/indra/newview/skins/default/xui/pl/floater_color_picker.xml @@ -23,9 +23,9 @@ <button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/> <button label="OK" label_selected="OK" name="select_btn"/> <text name="Current color:"> - Obecny Kolor: + Obecny kolor: </text> <text name="(Drag below to save.)"> - (Przeciągnij tutaj by zapisać) + (Przeciągnij tutaj aby zapisać) </text> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_customize.xml b/indra/newview/skins/default/xui/pl/floater_customize.xml index 5acab60642..dd1d5cf684 100644 --- a/indra/newview/skins/default/xui/pl/floater_customize.xml +++ b/indra/newview/skins/default/xui/pl/floater_customize.xml @@ -43,15 +43,15 @@ <text name="Item Action Label"> Kształt: </text> - <button label="Nowy Kształt" label_selected="Nowy Kształt" name="Create New"/> + <button label="Nowy kształt" label_selected="Nowy kształt" name="Create New"/> <button label="Zapisz" label_selected="Zapisz" name="Save"/> - <button label="Zapisz Jako..." label_selected="Zapisz Jako..." name="Save As"/> + <button label="Zapisz jako..." label_selected="Zapisz jako..." name="Save As"/> </panel> <panel label="Skórka" name="Skin"> - <button label="Kolor Skórki" label_selected="Kolor Skórki" name="Skin Color"/> - <button label="Detale Twarzy" label_selected="Detale Twarzy" name="Face Detail"/> + <button label="Kolor skórki" label_selected="Kolor skórki" name="Skin Color"/> + <button label="Detale twarzy" label_selected="Detale twarzy" name="Face Detail"/> <button label="Makijaż" label_selected="Makijaż" name="Makeup"/> - <button label="Detale Ciała" label_selected="Detale Ciała" name="Body Detail"/> + <button label="Detale ciała" label_selected="Detale ciała" name="Body Detail"/> <text name="title"> [DESC] </text> @@ -76,12 +76,12 @@ <text name="Item Action Label"> Skórka: </text> - <texture_picker label="Tatuaże Głowy" name="Head Tattoos" tool_tip="Kliknij by wybrać teksturę"/> - <texture_picker label="Tatuaże Górne" name="Upper Tattoos" tool_tip="Kliknij by wybrać teksturę"/> - <texture_picker label="Tatuaże Dolne" name="Lower Tattoos" tool_tip="Kliknij by wybrać teksturę"/> - <button label="Nowa Skórka" label_selected="Nowa Skórka" name="Create New"/> + <texture_picker label="Tatuaże głowy" name="Head Tattoos" tool_tip="Kliknij by wybrać teksturę"/> + <texture_picker label="Tatuaże górne" name="Upper Tattoos" tool_tip="Kliknij by wybrać teksturę"/> + <texture_picker label="Tatuaże dolne" name="Lower Tattoos" tool_tip="Kliknij by wybrać teksturę"/> + <button label="Nowa skórka" label_selected="Nowa skórka" name="Create New"/> <button label="Zapisz" label_selected="Zapisz" name="Save"/> - <button label="Zapisz Jako..." label_selected="Zapisz Jako..." name="Save As"/> + <button label="Zapisz jako..." label_selected="Zapisz jako..." name="Save As"/> <button label="Wróć" label_selected="Wróć" name="Revert"/> </panel> <panel label="Włosy" name="Hair"> @@ -114,9 +114,9 @@ Włosy: </text> <texture_picker label="Tekstura" name="Texture" tool_tip="Kliknij by wybrać teksturę"/> - <button label="Nowe Włosy" label_selected="Nowe Włosy" name="Create New"/> + <button label="Nowe włosy" label_selected="Nowe włosy" name="Create New"/> <button label="Zapisz" label_selected="Zapisz" name="Save"/> - <button label="Zapisz Jako..." label_selected="Zapisz Jako..." name="Save As"/> + <button label="Zapisz jako..." label_selected="Zapisz jako..." name="Save As"/> <button label="Wróć" label_selected="Wróć" name="Revert"/> </panel> <panel label="Oczy" name="Eyes"> @@ -145,9 +145,9 @@ Oczy: </text> <texture_picker label="Tęczówka" name="Iris" tool_tip="Kliknij by wybrać teksturę"/> - <button label="Nowe Oczy" label_selected="Nowe Oczy" name="Create New"/> + <button label="Nowe oczy" label_selected="Nowe oczy" name="Create New"/> <button label="Zapisz" label_selected="Zapisz" name="Save"/> - <button label="Zapisz Jako..." label_selected="Zapisz Jako..." name="Save As"/> + <button label="Zapisz jako..." label_selected="Zapisz jako..." name="Save As"/> <button label="Wróć" label_selected="Wróć" name="Revert"/> </panel> <text label="Ubrania" name="clothes_placeholder"> @@ -159,7 +159,7 @@ <button label="Zdejmij" label_selected="Zdejmij" name="Take Off"/> <button label="Nowa Koszula" label_selected="Nowa Koszula" name="Create New"/> <button label="Zapisz" label_selected="Zapisz" name="Save"/> - <button label="Zapisz Jako..." label_selected="Zapisz Jako..." name="Save As"/> + <button label="Zapisz jako..." label_selected="Zapisz jako..." name="Save As"/> <button label="Wróć" label_selected="Wróć" name="Revert"/> <text name="title"> [DESC] @@ -190,9 +190,9 @@ <texture_picker label="Materiał" name="Fabric" tool_tip="Kliknij tutaj by wybrać teksturę"/> <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/> <button label="Zdejmij" label_selected="Zdejmij" name="Take Off"/> - <button label="Nowe Spodnie" label_selected="Nowe Spodnie" name="Create New"/> + <button label="Nowe spodnie" label_selected="Nowe spodnie" name="Create New"/> <button label="Zapisz" label_selected="Zapisz" name="Save"/> - <button label="Zapisz Jako..." label_selected="Zapisz Jako..." name="Save As"/> + <button label="Zapisz jako..." label_selected="Zapisz jako..." name="Save As"/> <button label="Wróć" label_selected="Wróć" name="Revert"/> <text name="title"> [DESC] @@ -249,7 +249,7 @@ <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/> <button label="Zdejmij" label_selected="Zdejmij" name="Take Off"/> <button label="Zapisz" label_selected="Zapisz" name="Save"/> - <button label="Zapisz Jako..." label_selected="Zapisz Jako..." name="Save As"/> + <button label="Zapisz jako..." label_selected="Zapisz jako..." name="Save As"/> <button label="Wróć" label_selected="Wróć" name="Revert"/> </panel> <panel label="Skarpety" name="Socks"> @@ -282,7 +282,7 @@ <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/> <button label="Zdejmij" label_selected="Zdejmij" name="Take Off"/> <button label="Zapisz" label_selected="Zapisz" name="Save"/> - <button label="Zapisz Jako..." label_selected="Zapisz Jako..." name="Save As"/> + <button label="Zapisz jako..." label_selected="Zapisz jako..." name="Save As"/> <button label="Wróć" label_selected="Wróć" name="Revert"/> </panel> <panel label="Kurtka" name="Jacket"> @@ -311,12 +311,12 @@ <text name="Item Action Label"> Kurtka: </text> - <texture_picker label="Górny Materiał" name="Upper Fabric" tool_tip="Kliknij by wybrać teksturę" width="76"/> - <texture_picker label="Dolny Materiał" name="Lower Fabric" tool_tip="Kliknij by wybrać kolor" width="76"/> + <texture_picker label="Górny materiał" name="Upper Fabric" tool_tip="Kliknij by wybrać teksturę" width="76"/> + <texture_picker label="Dolny materiał" name="Lower Fabric" tool_tip="Kliknij by wybrać kolor" width="76"/> <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor" width="76"/> <button label="Zdejmij" label_selected="Zdejmij" name="Take Off"/> <button label="Zapisz" label_selected="Zapisz" name="Save"/> - <button label="Zapisz Jako..." label_selected="Zapisz Jako..." name="Save As"/> + <button label="Zapisz jako..." label_selected="Zapisz jako..." name="Save As"/> <button label="Wróć" label_selected="Wróć" name="Revert"/> </panel> <panel label="Rękawiczki" name="Gloves"> @@ -349,7 +349,7 @@ <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/> <button label="Zdejmij" label_selected="Zdejmij" name="Take Off"/> <button label="Zapisz" label_selected="Zapisz" name="Save"/> - <button label="Zapisz Jako..." label_selected="Zapisz Jako..." name="Save As"/> + <button label="Zapisz jako..." label_selected="Zapisz jako..." name="Save As"/> <button label="Wróć" label_selected="Wróć" name="Revert"/> </panel> <panel label="Podkoszulek" name="Undershirt"> @@ -382,7 +382,7 @@ <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/> <button label="Zdejmij" label_selected="Zdejmij" name="Take Off"/> <button label="Zapisz" label_selected="Zapisz" name="Save"/> - <button label="Zapisz Jako..." label_selected="Zapisz Jako..." name="Save As"/> + <button label="Zapisz jako..." label_selected="Zapisz jako..." name="Save As"/> <button label="Wróć" label_selected="Wróć" name="Revert"/> </panel> <panel label="Bielizna" name="Underpants"> @@ -415,7 +415,7 @@ <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/> <button label="Zdejmij" label_selected="Zdejmij" name="Take Off"/> <button label="Zapisz" label_selected="Zapisz" name="Save"/> - <button label="Zapisz Jako..." label_selected="Zapisz Jako..." name="Save As"/> + <button label="Zapisz jako..." label_selected="Zapisz jako..." name="Save As"/> <button label="Wróć" label_selected="Wróć" name="Revert"/> </panel> <panel label="Spódnica" name="Skirt"> @@ -448,7 +448,7 @@ <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/> <button label="Zdejmij" label_selected="Zdejmij" name="Take Off"/> <button label="Zapisz" label_selected="Zapisz" name="Save"/> - <button label="Zapisz Jako..." label_selected="Zapisz Jako..." name="Save As"/> + <button label="Zapisz jako..." label_selected="Zapisz jako..." name="Save As"/> <button label="Wróć" label_selected="Wróć" name="Revert"/> </panel> <panel label="Tatuaż" name="Tattoo"> @@ -477,9 +477,9 @@ <text name="Item Action Label"> Tatuaż: </text> - <texture_picker label="Tatuaż Głowy" name="Head Tattoo" tool_tip="Kliknij aby wybrać teksturę"/> - <texture_picker label="Górny Tatuaż" name="Upper Tattoo" tool_tip="Kliknij aby wybrać teksturę"/> - <texture_picker label="Tatuaż Dolnej Części Ciała" name="Lower Tattoo" tool_tip="Kliknij aby wybrać teksturę"/> + <texture_picker label="Tatuaż głowy" name="Head Tattoo" tool_tip="Kliknij aby wybrać teksturę"/> + <texture_picker label="Górny tatuaż" name="Upper Tattoo" tool_tip="Kliknij aby wybrać teksturę"/> + <texture_picker label="Tatuaż dolnej części ciała" name="Lower Tattoo" tool_tip="Kliknij aby wybrać teksturę"/> <button label="Zdejmij" label_selected="Zdejmij" name="Take Off"/> <button label="Zapisz" label_selected="Zapisz" name="Save"/> <button label="Zapisz jako..." label_selected="Zapisz jako..." name="Save As"/> @@ -512,18 +512,18 @@ Alpha: </text> <texture_picker label="Dolna Alpha" name="Lower Alpha" tool_tip="Kliknij aby wybrać teksturę"/> - <texture_picker label="Alpha Górnej Części Ciała" name="Upper Alpha" tool_tip="Kliknij aby wybrać teksturę"/> - <texture_picker label="Alpha Głowy" name="Head Alpha" tool_tip="Kliknij aby wybrać teksturę"/> - <texture_picker label="Alpha Oka" name="Eye Alpha" tool_tip="Kliknij aby wybrać teksturę"/> - <texture_picker label="Alpha Włosów" name="Hair Alpha" tool_tip="Kliknij aby wybrać teksturę"/> + <texture_picker label="Alpha górnej części ciała" name="Upper Alpha" tool_tip="Kliknij aby wybrać teksturę"/> + <texture_picker label="Alpha głowy" name="Head Alpha" tool_tip="Kliknij aby wybrać teksturę"/> + <texture_picker label="Alpha oka" name="Eye Alpha" tool_tip="Kliknij aby wybrać teksturę"/> + <texture_picker label="Alpha włosów" name="Hair Alpha" tool_tip="Kliknij aby wybrać teksturę"/> <button label="Zdejmij" label_selected="Zdejmij" name="Take Off"/> <button label="Zapisz" label_selected="Zapisz" name="Save"/> <button label="Zapisz jako..." label_selected="Zapisz jako..." name="Save As"/> <button label="Wróć" label_selected="Wróć" name="Revert"/> </panel> </tab_container> - <button label="Info o Skrypcie" label_selected="Info o Skrypcie" name="script_info" tool_tip="Pokaż skrypty przyłączone do Twojego awatara"/> - <button label="Stwórz Ubranie" label_selected="Stwórz Ubranie" name="make_outfit_btn"/> + <button label="Info o skrypcie" label_selected="Info o skrypcie" name="script_info" tool_tip="Pokaż skrypty przyłączone do Twojego awatara"/> + <button label="Stwórz ubranie" label_selected="Stwórz Ubranie" name="make_outfit_btn"/> <button label="Anuluj" label_selected="Anuluj" name="Cancel"/> <button label="OK" label_selected="OK" name="Ok"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml b/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml index 6671bb853e..0cb2114f99 100644 --- a/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml +++ b/indra/newview/skins/default/xui/pl/floater_day_cycle_options.xml @@ -62,7 +62,7 @@ <button label="Dodaj" label_selected="Dodaj" name="WLAddKey" /> <button label="Usuń" label_selected="Usuń" name="WLDeleteKey" /> <text name="WLCurKeyFrameText"> - Preferencje Czasu: + Preferencje czasu: </text> <text name="WLCurKeyTimeText"> Czas: @@ -78,7 +78,7 @@ </text> <combo_box label="5 min" name="WLSnapOptions" /> <text name="DayCycleText2"> - Długość Cyklu: + Długość cyklu: </text> <spinner label="Godz" name="WLLengthOfDayHour" /> <spinner label="Min" name="WLLengthOfDayMin" /> @@ -88,11 +88,11 @@ </text> <button label="Start" label_selected="Start" name="WLAnimSky" /> <button label="Stop" label_selected="Stop" name="WLStopAnimSky" /> - <button label="Używaj Czasu Regionu" label_selected="Używaj Czasu Regionu" + <button label="Używaj czasu regionu" label_selected="Używaj czasu regionu" name="WLUseLindenTime" /> - <button label="Zapisz Test Dnia" label_selected="Zapisz Test Dnia" + <button label="Zapisz test dnia" label_selected="Zapisz test dnia" name="WLSaveDayCycle" /> - <button label="Załaduj Test Dnia" label_selected="Załaduj Test Dnia" + <button label="Załaduj test dnia" label_selected="Załaduj test dnia" name="WLLoadDayCycle" /> </panel> </tab_container> diff --git a/indra/newview/skins/default/xui/pl/floater_env_settings.xml b/indra/newview/skins/default/xui/pl/floater_env_settings.xml index fb4c505ff3..3ab854fbbb 100644 --- a/indra/newview/skins/default/xui/pl/floater_env_settings.xml +++ b/indra/newview/skins/default/xui/pl/floater_env_settings.xml @@ -15,14 +15,14 @@ </text> <slider label="" name="EnvCloudSlider"/> <text name="EnvWaterColorText"> - Kolor Wody + Kolor wody </text> <color_swatch label="" name="EnvWaterColor" tool_tip="Kliknij aby wybrać kolor"/> <text name="EnvWaterFogText"> Zamglenie: </text> <slider label="" name="EnvWaterFogSlider"/> - <button label="Używaj Czasu Regionu" name="EnvUseEstateTimeButton"/> - <button label="Zaawansowane Niebo" name="EnvAdvancedSkyButton"/> - <button label="Zaawansowana Woda" name="EnvAdvancedWaterButton"/> + <button label="Używaj czasu regionu" name="EnvUseEstateTimeButton"/> + <button label="Zaawansowane niebo" name="EnvAdvancedSkyButton"/> + <button label="Zaawansowana woda" name="EnvAdvancedWaterButton"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_event.xml b/indra/newview/skins/default/xui/pl/floater_event.xml index dfdc87b079..7588493464 100644 --- a/indra/newview/skins/default/xui/pl/floater_event.xml +++ b/indra/newview/skins/default/xui/pl/floater_event.xml @@ -10,13 +10,13 @@ Nie zawiadamiaj </floater.string> <floater.string name="moderate"> - Moderuj + Mature </floater.string> <floater.string name="adult"> Adult </floater.string> <floater.string name="general"> - Ogólne + PG </floater.string> <floater.string name="unknown"> Nieznana diff --git a/indra/newview/skins/default/xui/pl/floater_gesture.xml b/indra/newview/skins/default/xui/pl/floater_gesture.xml index d12ea98815..750a9e4a66 100644 --- a/indra/newview/skins/default/xui/pl/floater_gesture.xml +++ b/indra/newview/skins/default/xui/pl/floater_gesture.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater label="Miejsca" name="gestures" title="GESTURY"> +<floater label="Miejsca" name="gestures" title="GESTY"> <floater.string name="loading"> Ładowanie... </floater.string> @@ -18,8 +18,8 @@ <panel label="bottom_panel" name="bottom_panel"> <menu_button name="gear_btn" tool_tip="Więcej opcji"/> <button name="new_gesture_btn" tool_tip="Stwórz nową gesturę"/> - <button name="activate_btn" tool_tip="Aktywuj/Dezaktywuj wybraną gesturę"/> - <button name="del_btn" tool_tip="Usuń gesturę"/> + <button name="activate_btn" tool_tip="Aktywuj/Dezaktywuj wybrany gest"/> + <button name="del_btn" tool_tip="Usuń gest"/> </panel> <button label="Edytuj" name="edit_btn"/> <button label="Odtwarzaj" name="play_btn"/> diff --git a/indra/newview/skins/default/xui/pl/floater_god_tools.xml b/indra/newview/skins/default/xui/pl/floater_god_tools.xml index d3ff603970..4d49c32fc1 100644 --- a/indra/newview/skins/default/xui/pl/floater_god_tools.xml +++ b/indra/newview/skins/default/xui/pl/floater_god_tools.xml @@ -3,7 +3,7 @@ <tab_container name="GodTools Tabs"> <panel label="Grid" name="grid"> <button label="Wyrzuć wszystkich Rezydentów" label_selected="Wyrzuć wszystkich Rezydentów" name="Kick all users" width="205"/> - <button label="Wyrównaj Widoczność Buforu Mapy Regionu" label_selected="Wyrównaj Widoczność Buforu Mapy Regionu" name="Flush This Region's Map Visibility Caches" width="285"/> + <button label="Wyrównaj widoczność buforu mapy Regionu" label_selected="Wyrównaj widoczność buforu mapy Regionu" name="Flush This Region's Map Visibility Caches" width="285"/> </panel> <panel label="Region" name="region"> <text name="Sim Name:" width="100"> @@ -12,15 +12,15 @@ <line_editor left="115" name="region name" width="178"/> <check_box label="Wstęp" name="check prelude" tool_tip="Set this to make the region a prelude"/> <check_box label="Korekta Słońca" name="check fixed sun" tool_tip="Skorektuj ustawienia pozycji słońca."/> - <check_box height="32" label="Zresetuj Pozycję Miejsca Startowego" name="check reset home" tool_tip="Zresetuj miejsce startu Rezydentów po teleportacji"/> - <check_box bottom_delta="-32" label="Widoczny" name="check visible" tool_tip="Wybierz tę opcję by ustawić region widocznym dla wszystkich."/> + <check_box height="32" label="Zresetuj pozycję Miejsca Startowego" name="check reset home" tool_tip="Zresetuj miejsce startu Rezydentów po teleportacji"/> + <check_box bottom_delta="-32" label="Widoczny" name="check visible" tool_tip="Wybierz tą opcję by ustawić region widocznym dla wszystkich."/> <check_box label="Zniszczenia" name="check damage" tool_tip="Wybierz tę opcję by uruchomić opcję zniszczeń w regionie."/> - <check_box label="Zablokuj Monitorowanie Trafficu" name="block dwell" tool_tip="Wybierz tę opcję by zablokować monitorowanie trafficu w regionie."/> - <check_box label="Zablokuj Terraformowanie" name="block terraform" tool_tip="Wybierz tę opcję by zablokować terraforming w regionie"/> + <check_box label="Zablokuj Monitorowanie Trafficu" name="block dwell" tool_tip="Wybierz tą opcję by zablokować monitorowanie trafficu w regionie."/> + <check_box label="Zablokuj Terraformowanie" name="block terraform" tool_tip="Wybierz tą opcję by zablokować terraforming w regionie"/> <check_box label="Piaskownica" name="is sandbox" tool_tip="Toggle whether this is a sandbox region"/> - <button label="Ustal Teren" label_selected="Ustal Teren" name="Bake Terrain" tool_tip="Zapamiętaj obecny teren jako początkowy dla cofnięcia modyfikacji terenu." width="138"/> - <button label="Cofnięcie Modyfikacji" label_selected="Cofnięcie Modyfikacji" name="Revert Terrain" tool_tip="Przywróć Ustawienia Domyślne Regionu." width="138"/> - <button label="Zamień Teren" label_selected="Zamień Teren" name="Swap Terrain" tool_tip="Swap current terrain with default" width="138"/> + <button label="Ustal teren" label_selected="Ustal teren" name="Bake Terrain" tool_tip="Zapamiętaj obecny teren jako początkowy dla cofnięcia modyfikacji terenu." width="138"/> + <button label="Cofnięcie modyfikacji" label_selected="Cofnięcie modyfikacji" name="Revert Terrain" tool_tip="Przywróć ustawienia domyślne Regionu." width="138"/> + <button label="Zamień teren" label_selected="Zamień teren" name="Swap Terrain" tool_tip="Swap current terrain with default" width="138"/> <text name="estate id"> ID Regionu: </text> @@ -40,7 +40,7 @@ <line_editor left_delta="110" name="redirectx" width="35"/> <line_editor left_delta="45" name="redirecty" width="35"/> <text name="billable factor text"> - Czynnik Płatności: + Czynnik płatności: </text> <spinner name="billable factor"/> <text name="land cost text"> @@ -49,8 +49,8 @@ <spinner name="land cost"/> <button label="Odśwież" label_selected="Odśwież" name="Refresh" tool_tip="Click here to refresh the above information"/> <button label="Zastosuj" label_selected="Zastosuj" name="Apply" tool_tip="Click here to apply any changes from above"/> - <button label="Wybierz Region" label_selected="Wybierz Region" left="156" name="Select Region" tool_tip="Wybierz cały region za pomocą narzędzi edycji terenu" width="150"/> - <button label="Automatyczne Zapisanie" label_selected="Automatyczne Zapisanie" left="156" name="Autosave now" tool_tip="Save gzipped state to autosave directory" width="150"/> + <button label="Wybierz Region" label_selected="Wybierz Region" left="156" name="Select Region" tool_tip="Wybierz cały Region za pomocą narzędzi edycji terenu" width="150"/> + <button label="Automatyczne zapisanie" label_selected="Automatyczne zapisanie" left="156" name="Autosave now" tool_tip="Save gzipped state to autosave directory" width="150"/> </panel> <panel label="Obiekty" name="objects"> <text name="Sim Name:" width="105"> @@ -59,9 +59,9 @@ <text left_delta="110" name="region name"> Welsh </text> - <check_box label="Wyłącz Skrypty" name="disable scripts" tool_tip="Set this to disable all scripts in this region"/> - <check_box label="Deaktywuj Kolizje" name="disable collisions" tool_tip="Set this to disable non-agent collisions in this region"/> - <check_box label="Wylącz Fizykę" name="disable physics" tool_tip="Set this to disable all physics in this region"/> + <check_box label="Wyłącz skrypty" name="disable scripts" tool_tip="Set this to disable all scripts in this region"/> + <check_box label="Deaktywuj kolizje" name="disable collisions" tool_tip="Set this to disable non-agent collisions in this region"/> + <check_box label="Wylącz fizykę" name="disable physics" tool_tip="Set this to disable all physics in this region"/> <button label="Zastosuj" label_selected="Zastosuj" name="Apply" tool_tip="Click here to apply any changes from above"/> <button label="Ustaw Cel" label_selected="Set Target" name="Set Target" tool_tip="Set the target avatar for object deletion"/> <text name="target_avatar_name"> @@ -70,8 +70,8 @@ <button label="Usuń cel z oskryptowanych obiektów na innych posiadłościach" label_selected="Usuń cel 's skryptowane obiekty na innych posiadłościach" name="Delete Target's Scripted Objects On Others Land" tool_tip="Delete all scripted objects owned by the target on land not owned by the target. (no copy) objects will be returned."/> <button label="Usuń cel z oskryptowanych obiektów na jakichkolwiek posiadłościach" label_selected="Usuń cel 's skryptowane obiekty na jakichkolwiek posiadłościach" name="Delete Target's Scripted Objects On *Any* Land" tool_tip="Delete all scripted objects owned by the target in this region. (no copy) objects will be returned."/> <button label="Usuń wszystkie cele i obiekty" label_selected="Usuń wszystkie cele i obiekty" name="Delete *ALL* Of Target's Objects" tool_tip="Delete all objects owned by the target in this region. (no copy) objects will be returned."/> - <button label="Główne Kolizje" label_selected="Główne Kolizje" name="Get Top Colliders" tool_tip="Gets list of objects experiencing the most narrowphase callbacks"/> - <button label="Główne Skrypty" label_selected="Główne Skrypty" name="Get Top Scripts" tool_tip="Gets list of objects spending the most time running scripts"/> + <button label="Główne kolizje" label_selected="Główne kolizje" name="Get Top Colliders" tool_tip="Gets list of objects experiencing the most narrowphase callbacks"/> + <button label="Główne skrypty" label_selected="Główne skrypty" name="Get Top Scripts" tool_tip="Gets list of objects spending the most time running scripts"/> <button label="Treść skryptów" label_selected="Treść skryptów" name="Scripts digest" tool_tip="Wyświetla listę wszystkich skryptów i liczbę ich zastosowań."/> </panel> <panel label="Zażądaj" name="request"> diff --git a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml index 85e8194834..bd5dd7e7d2 100644 --- a/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml +++ b/indra/newview/skins/default/xui/pl/floater_hardware_settings.xml @@ -3,9 +3,9 @@ <text name="Filtering:"> Filtrowanie: </text> - <check_box label="Filtrowanie Anizotropowe" name="ani"/> + <check_box label="Filtr anizotropowy" name="ani"/> <text name="Antialiasing:"> - Antialiasing: + Antyaliasing: </text> <combo_box label="Antialiasing" name="fsaa" width="84"> <combo_box.item label="Wyłączone" name="FSAADisabled"/> @@ -21,8 +21,8 @@ <text name="Enable VBO:"> Włącz VBO: </text> - <check_box initial_value="true" label="Włącz Bufor Vertexów OpenGL" name="vbo" tool_tip=""/> - <slider label="Pamięć Tekstur (MB):" name="GraphicsCardTextureMemory" tool_tip="Ilość alokacji pamięci dla tekstur. Domyślne dla karty pamięci video. Obniżenie poziomu tych funkcji może polepszyć wydajność systemową jednak spowoduje zmniejszenie jakości i wyrazistości tekstur."/> - <spinner label="Stosunek Dystansu Mgły:" name="fog"/> + <check_box initial_value="true" label="Włącz rozszerzenie OpenGL" name="vbo" tool_tip=""/> + <slider label="Pamięć na tekstury (MB):" name="GraphicsCardTextureMemory" tool_tip="Ilość alokacji pamięci dla tekstur. Domyślne dla karty pamięci video. Obniżenie poziomu tych funkcji może polepszyć wydajność systemową jednak spowoduje zmniejszenie jakości i wyrazistości tekstur."/> + <spinner label="Stosunek dystansu mgły:" name="fog"/> <button label="OK" label_selected="OK" name="OK"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_im_session.xml b/indra/newview/skins/default/xui/pl/floater_im_session.xml index f4dd7d00e1..db513f787c 100644 --- a/indra/newview/skins/default/xui/pl/floater_im_session.xml +++ b/indra/newview/skins/default/xui/pl/floater_im_session.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="panel_im"> <layout_stack name="im_panels"> - <layout_panel label="Panel Kontroli Wiadomości Prywatnej (IM)" name="panel_im_control_panel"/> + <layout_panel label="Panel kontroli wiadomości prywatnej (IM)" name="panel_im_control_panel"/> <layout_panel> <line_editor label="Do" name="chat_editor"/> </layout_panel> diff --git a/indra/newview/skins/default/xui/pl/floater_image_preview.xml b/indra/newview/skins/default/xui/pl/floater_image_preview.xml index 6c61cfcacf..a27e8ffed3 100644 --- a/indra/newview/skins/default/xui/pl/floater_image_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_image_preview.xml @@ -12,12 +12,12 @@ <combo_box label="Rodzaj Ubrania" name="clothing_type_combo"> <combo_box.item label="Obraz" name="Image"/> <combo_box.item label="Włosy" name="Hair"/> - <combo_box.item label="Damska Głowa" name="FemaleHead"/> - <combo_box.item label="Damska Górna Część Ciała" name="FemaleUpperBody"/> - <combo_box.item label="Damska Górna Część Ciała" name="FemaleLowerBody"/> - <combo_box.item label="Męska Głowa" name="MaleHead"/> - <combo_box.item label="Męska Górna Część Ciała" name="MaleUpperBody"/> - <combo_box.item label="Męska Dolna Część Ciała" name="MaleLowerBody"/> + <combo_box.item label="Damska głowa" name="FemaleHead"/> + <combo_box.item label="Damska górna część ciała" name="FemaleUpperBody"/> + <combo_box.item label="Damska górna część ciała" name="FemaleLowerBody"/> + <combo_box.item label="Męska głowa" name="MaleHead"/> + <combo_box.item label="Męska górna część ciała" name="MaleUpperBody"/> + <combo_box.item label="Męska dolna część ciała" name="MaleLowerBody"/> <combo_box.item label="Spódnica" name="Skirt"/> <combo_box.item label="Prim sculptowy" name="SculptedPrim"/> </combo_box> diff --git a/indra/newview/skins/default/xui/pl/floater_incoming_call.xml b/indra/newview/skins/default/xui/pl/floater_incoming_call.xml index fa2308675e..e5ec3804ae 100644 --- a/indra/newview/skins/default/xui/pl/floater_incoming_call.xml +++ b/indra/newview/skins/default/xui/pl/floater_incoming_call.xml @@ -4,7 +4,7 @@ 5 </floater.string> <floater.string name="localchat"> - Rozmowy Głosowe w Pobliżu + Rozmowy głosowe w pobliżu </floater.string> <floater.string name="anonymous"> anonimowy diff --git a/indra/newview/skins/default/xui/pl/floater_inspect.xml b/indra/newview/skins/default/xui/pl/floater_inspect.xml index f595f0c7dd..2c66f2851d 100644 --- a/indra/newview/skins/default/xui/pl/floater_inspect.xml +++ b/indra/newview/skins/default/xui/pl/floater_inspect.xml @@ -7,7 +7,7 @@ <scroll_list.columns label="Nazwa" name="object_name"/> <scroll_list.columns label="Właściciel" name="owner_name"/> <scroll_list.columns label="Twórca" name="creator_name"/> - <scroll_list.columns label="Data Kreacji" name="creation_date"/> + <scroll_list.columns label="Data kreacji" name="creation_date"/> </scroll_list> <button label="Profil Właściciela..." label_selected="" name="button owner" tool_tip=""/> <button label="Profil Twórcy..." label_selected="" name="button creator" tool_tip=""/> diff --git a/indra/newview/skins/default/xui/pl/floater_inventory.xml b/indra/newview/skins/default/xui/pl/floater_inventory.xml index 42aebe99d6..0dc4d5b96d 100644 --- a/indra/newview/skins/default/xui/pl/floater_inventory.xml +++ b/indra/newview/skins/default/xui/pl/floater_inventory.xml @@ -4,7 +4,7 @@ MOJA SZAFA </floater.string> <floater.string name="TitleFetching"> - MOJA SZAFA (Fetching [ITEM_COUNT] Obiekty...) [FILTER] + MOJA SZAFA (Dostarczanie [ITEM_COUNT] obiektów...) [FILTER] </floater.string> <floater.string name="TitleCompleted"> MOJA SZAFA ([ITEM_COUNT] Obiektów) [FILTER] diff --git a/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml index 9204262304..bd7b221c5d 100644 --- a/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml +++ b/indra/newview/skins/default/xui/pl/floater_inventory_view_finder.xml @@ -4,7 +4,7 @@ <check_box label="Wizytówki" name="check_calling_card" /> <check_box label="Ubrania" name="check_clothing" /> <check_box label="Gesty" name="check_gesture" /> - <check_box label="Zakładki Miejsc" name="check_landmark" /> + <check_box label="Landmarki" name="check_landmark" /> <check_box label="Noty" name="check_notecard" /> <check_box label="Obiekty" name="check_object" /> <check_box label="Skrypty" name="check_script" /> diff --git a/indra/newview/skins/default/xui/pl/floater_joystick.xml b/indra/newview/skins/default/xui/pl/floater_joystick.xml index b0b4f173b2..78742c39d1 100644 --- a/indra/newview/skins/default/xui/pl/floater_joystick.xml +++ b/indra/newview/skins/default/xui/pl/floater_joystick.xml @@ -5,10 +5,10 @@ <spinner label="Kalibracja Osi X" label_width="130" left="20" name="JoystickAxis1" width="170"/> <spinner label="Kalibracja Osi Y" label_width="130" left="210" name="JoystickAxis2" width="170"/> <spinner label="Kalibracja Osi Z" label_width="130" left="400" name="JoystickAxis0" width="170"/> - <spinner label="Kalibracja Wznoszenia" label_width="130" left="20" name="JoystickAxis4" width="170"/> - <spinner label="Kalibracja Wychylania" label_width="130" left="210" name="JoystickAxis5" width="170"/> - <spinner label="Kalibracja Obrotu" label_width="130" left="400" name="JoystickAxis3" width="170"/> - <spinner label="Kalibracja Powiększania" label_width="130" name="JoystickAxis6" width="170"/> + <spinner label="Kalibracja wznoszenia" label_width="130" left="20" name="JoystickAxis4" width="170"/> + <spinner label="Kalibracja wychylania" label_width="130" left="210" name="JoystickAxis5" width="170"/> + <spinner label="Kalibracja obrotu" label_width="130" left="400" name="JoystickAxis3" width="170"/> + <spinner label="Kalibracja powiększania" label_width="130" name="JoystickAxis6" width="170"/> <check_box label="Bezpośrednie" left="205" name="ZoomDirect"/> <check_box label="Kursor 3D" left="340" name="Cursor3D"/> <check_box label="Automatyczne" left="450" name="AutoLeveling"/> @@ -37,54 +37,54 @@ <spinner left="208" name="BuildAxisScale0"/> <spinner left="283" name="FlycamAxisScale0"/> <text name="PitchScale" width="104"> - Skala Wznoszenia + Skala wznoszenia </text> <spinner left="133" name="AvatarAxisScale4"/> <spinner left="208" name="BuildAxisScale4"/> <spinner left="283" name="FlycamAxisScale4"/> <text name="YawScale" width="104"> - Skala Odchylania + Skala odchylania </text> <spinner left="133" name="AvatarAxisScale5"/> <spinner left="208" name="BuildAxisScale5"/> <spinner left="283" name="FlycamAxisScale5"/> <text name="RollScale" width="104"> - Skala Obrotu + Skala obrotu </text> <spinner left="208" name="BuildAxisScale3"/> <spinner left="283" name="FlycamAxisScale3"/> <text name="XDeadZone" width="104"> - Tolerancja Osi X + Tolerancja osi X </text> <spinner left="133" name="AvatarAxisDeadZone1"/> <spinner left="208" name="BuildAxisDeadZone1"/> <spinner left="283" name="FlycamAxisDeadZone1"/> <text name="YDeadZone" width="104"> - Tolerancja Osi Y + Tolerancja osi Y </text> <spinner left="133" name="AvatarAxisDeadZone2"/> <spinner left="208" name="BuildAxisDeadZone2"/> <spinner left="283" name="FlycamAxisDeadZone2"/> <text name="ZDeadZone" width="104"> - Tolerancja Osi Z + Tolerancja osi Z </text> <spinner left="133" name="AvatarAxisDeadZone0"/> <spinner left="208" name="BuildAxisDeadZone0"/> <spinner left="283" name="FlycamAxisDeadZone0"/> <text name="PitchDeadZone" width="104"> - Tolerancja Wznoszenia + Tolerancja wznoszenia </text> <spinner left="133" name="AvatarAxisDeadZone4"/> <spinner left="208" name="BuildAxisDeadZone4"/> <spinner left="283" name="FlycamAxisDeadZone4"/> <text name="YawDeadZone" width="104"> - Tolerancja Odchylania + Tolerancja odchylania </text> <spinner left="133" name="AvatarAxisDeadZone5"/> <spinner left="208" name="BuildAxisDeadZone5"/> <spinner left="283" name="FlycamAxisDeadZone5"/> <text name="RollDeadZone" width="104"> - Tolerancja Obrotu + Tolerancja obrotu </text> <spinner left="208" name="BuildAxisDeadZone3"/> <spinner left="283" name="FlycamAxisDeadZone3"/> @@ -95,14 +95,14 @@ <slider label="" left="200" name="BuildFeathering"/> <slider label="" left="275" name="FlycamFeathering"/> <text name="ZoomScale2" width="104"> - Skala Powiększania + Skala powiększania </text> <spinner label="" left="283" name="FlycamAxisScale6"/> <text name="ZoomDeadZone" width="104"> - Tolerancja Powiększania + Tolerancja powiększania </text> <spinner label="" left="283" name="FlycamAxisDeadZone6"/> - <button label="Ustawienia Domyślne" left="366" name="SpaceNavigatorDefaults"/> + <button label="Ustawienia domyślne" left="366" name="SpaceNavigatorDefaults"/> <button label="OK" label_selected="OK" left="366" name="ok_btn"/> <button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/> <stat_view label="Monitor Joysticka" name="axis_view"> diff --git a/indra/newview/skins/default/xui/pl/floater_lagmeter.xml b/indra/newview/skins/default/xui/pl/floater_lagmeter.xml index cc71c1dc33..8038550bcb 100644 --- a/indra/newview/skins/default/xui/pl/floater_lagmeter.xml +++ b/indra/newview/skins/default/xui/pl/floater_lagmeter.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_lagmeter" title="POMIAR LAGÓW"> <floater.string name="max_title_msg"> - Pomiar Lagów + Pomiar lagów </floater.string> <floater.string name="max_width_px"> 360 @@ -34,16 +34,16 @@ W normie </floater.string> <floater.string name="client_draw_distance_cause_msg"> - Przyczyna: Dystans rysowania jest za wysoki + Przyczyna: dystans rysowania jest za wysoki </floater.string> <floater.string name="client_texture_loading_cause_msg"> - Przyczyna: Ładowanie obrazu + Przyczyna: ładowanie obrazu </floater.string> <floater.string name="client_texture_memory_cause_msg"> - Przyczyna: Za dużo obrazów w pamięci + Przyczyna: za dużo obrazów w pamięci </floater.string> <floater.string name="client_complex_objects_cause_msg"> - Przyczyna: Za dużo złożonych obiektów + Przyczyna: za dużo złożonych obiektów </floater.string> <floater.string name="network_text_msg"> Sieć @@ -103,22 +103,22 @@ W normie </floater.string> <floater.string name="server_physics_cause_msg"> - Przyczyna: Za dużo obiektów fizycznych + Przyczyna: za dużo obiektów fizycznych </floater.string> <floater.string name="server_scripts_cause_msg"> - Przyczyna: Za dużo obieków skryptowanych + Przyczyna: za dużo obieków skryptowanych </floater.string> <floater.string name="server_net_cause_msg"> - Przyczyna: Za duży ruch w sieci + Przyczyna: za duży ruch w sieci </floater.string> <floater.string name="server_agent_cause_msg"> - Przyczyna: Za dużo poruszających się awatarów w regionie + Przyczyna: za dużo poruszających się awatarów w regionie </floater.string> <floater.string name="server_images_cause_msg"> - Przyczyna: Za dużo kalkulacji obrazu + Przyczyna: za dużo kalkulacji obrazu </floater.string> <floater.string name="server_generic_cause_msg"> - Przyczyna: Symulator ładuje się zbyt powoli + Przyczyna: symulator ładuje się zbyt powoli </floater.string> <floater.string name="smaller_label"> >> diff --git a/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml b/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml index 0dc5b9f663..7b1b395f87 100644 --- a/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml +++ b/indra/newview/skins/default/xui/pl/floater_lsl_guide.xml @@ -3,5 +3,5 @@ <check_box label="Idź za kursorem" name="lock_check"/> <combo_box label="Zablokuj" name="history_combo"/> <button label="Wróć" name="back_btn"/> - <button label="Do Przodu" name="fwd_btn"/> + <button label="Do przodu" name="fwd_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_media_browser.xml b/indra/newview/skins/default/xui/pl/floater_media_browser.xml index 4a513f146d..9787736ad8 100644 --- a/indra/newview/skins/default/xui/pl/floater_media_browser.xml +++ b/indra/newview/skins/default/xui/pl/floater_media_browser.xml @@ -3,15 +3,15 @@ <layout_stack name="stack1"> <layout_panel name="nav_controls"> <button label="Wróć" name="back"/> - <button label="Do Przodu" name="forward"/> + <button label="Do przodu" name="forward"/> <button label="Załaduj" name="reload"/> <button label="Idź" name="go"/> </layout_panel> <layout_panel name="parcel_owner_controls"> - <button label="Wyślij bieżącą Stronę do Parceli" name="assign"/> + <button label="Wyślij bieżącą stronę do Parceli" name="assign"/> </layout_panel> <layout_panel name="external_controls"> - <button label="Użyj Mojej Przeglądarki" name="open_browser"/> + <button label="Użyj mojej przeglądarki" name="open_browser"/> <check_box label="Zawsze otwieraj w mojej przeglądarce internetowej" name="open_always"/> <button label="Zamknij" name="close"/> </layout_panel> diff --git a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml index 87d74f6c15..9ce99692d0 100644 --- a/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml +++ b/indra/newview/skins/default/xui/pl/floater_mem_leaking.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="MemLeak" title="STYMULACJA WYCIEKU PAMIĘCI"> - <spinner label="Prędkość Przecieków (byty na klatkę):" name="leak_speed"/> - <spinner label="Max Przecieki (MB):" name="max_leak"/> + <spinner label="Prędkość przecieków (byty na klatkę):" name="leak_speed"/> + <spinner label="Max przecieki (MB):" name="max_leak"/> <text name="total_leaked_label"> Przeciekło: [SIZE] KB </text> diff --git a/indra/newview/skins/default/xui/pl/floater_moveview.xml b/indra/newview/skins/default/xui/pl/floater_moveview.xml index 9f93335177..9c97a8a0e7 100644 --- a/indra/newview/skins/default/xui/pl/floater_moveview.xml +++ b/indra/newview/skins/default/xui/pl/floater_moveview.xml @@ -28,8 +28,8 @@ Lataj </string> <panel name="panel_actions"> - <button label="" label_selected="" name="turn left btn" tool_tip="Obróć w Lewo (naciśnij Lewą Strzałkę lub A)"/> - <button label="" label_selected="" name="turn right btn" tool_tip="Obróć w Prawo (naciśnij Prawą Strzałkę lub D)"/> + <button label="" label_selected="" name="turn left btn" tool_tip="Obróć w lewo (naciśnij Lewą Strzałkę lub A)"/> + <button label="" label_selected="" name="turn right btn" tool_tip="Obróć w prawo (naciśnij Prawą Strzałkę lub D)"/> <button label="" label_selected="" name="move up btn" tool_tip="Leć do góry, naciśnij E"/> <button label="" label_selected="" name="move down btn" tool_tip="Leć w dół, naciśnij C"/> <joystick_turn name="forward btn" tool_tip="Idź (naciśnij Strzałkę w Górę lub W)"/> @@ -38,6 +38,6 @@ <panel name="panel_modes"> <button label="" name="mode_walk_btn" tool_tip="Tryb chodzenia"/> <button label="" name="mode_run_btn" tool_tip="Tryb biegu"/> - <button label="" name="mode_fly_btn" tool_tip="Tryb Latania"/> + <button label="" name="mode_fly_btn" tool_tip="Tryb latania"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_openobject.xml b/indra/newview/skins/default/xui/pl/floater_openobject.xml index e30fbe3889..8e94ae821c 100644 --- a/indra/newview/skins/default/xui/pl/floater_openobject.xml +++ b/indra/newview/skins/default/xui/pl/floater_openobject.xml @@ -4,5 +4,5 @@ [DESC]: </text> <button label="Kopiuj do Szafy" label_selected="Kopiuj do Szafy" name="copy_to_inventory_button"/> - <button label="Kopiuj i Zalóż" label_selected="Kopiuj i Załóż" name="copy_and_wear_button"/> + <button label="Kopiuj i zalóż" label_selected="Kopiuj i załóż" name="copy_and_wear_button"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_outfit_save_as.xml b/indra/newview/skins/default/xui/pl/floater_outfit_save_as.xml index 7e55f6db3b..a8d2e10c5f 100644 --- a/indra/newview/skins/default/xui/pl/floater_outfit_save_as.xml +++ b/indra/newview/skins/default/xui/pl/floater_outfit_save_as.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="modal container" title="Stwórz Ubranie"> +<floater name="modal container" title="Stwórz ubranie"> <button label="Zapisz" label_selected="Zapisz" name="Save"/> <button label="Anuluj" label_selected="Anuluj" name="Cancel"/> <text name="Save item as:"> diff --git a/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml b/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml index 5522c02631..8a70cb3247 100644 --- a/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml +++ b/indra/newview/skins/default/xui/pl/floater_outgoing_call.xml @@ -4,7 +4,7 @@ 5 </floater.string> <floater.string name="localchat"> - Rozmowy Głosowe w Pobliżu + Rozmowy głosowe w pobliżu </floater.string> <floater.string name="anonymous"> anonimowy @@ -13,7 +13,7 @@ dzwoni. </floater.string> <floater.string name="VoiceInviteAdHoc"> - uczestniczy w Konferencyjnej Rozmowie Głosowej + uczestniczy w konferencyjnej rozmowie głosowej </floater.string> <text name="connecting"> Łączy z [CALLEE_NAME] @@ -25,10 +25,10 @@ Brak odpowiedzi. Proszę spróbować ponownie później. </text> <text name="nearby"> - Zostaleś rozłączony od [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY] + Zostaleś rozłączony z [VOICE_CHANNEL_NAME]. [RECONNECT_NEARBY] </text> <text name="nearby_P2P_by_other"> - [VOICE_CHANNEL_NAME] has ended the call. [RECONNECT_NEARBY] + [VOICE_CHANNEL_NAME] zakończył/a rozmowę głosową. [RECONNECT_NEARBY] </text> <text name="nearby_P2P_by_agent"> Zakończyłeś rozmowę. [RECONNECT_NEARBY] diff --git a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml index 1b0dd6113e..2128cfa3c8 100644 --- a/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml +++ b/indra/newview/skins/default/xui/pl/floater_perm_prefs.xml @@ -5,7 +5,7 @@ <check_box label="Udostępnij grupie" name="share_with_group"/> <check_box label="Pozwól kopiować każdemu" name="everyone_copy"/> <text name="NextOwnerLabel"> - Następny właściciel: + Następny Właściciel: </text> <check_box label="Modyfikuje" name="next_owner_modify"/> <check_box label="Kopiuje" name="next_owner_copy"/> diff --git a/indra/newview/skins/default/xui/pl/floater_post_process.xml b/indra/newview/skins/default/xui/pl/floater_post_process.xml index 6bd91f97b1..a3515915bf 100644 --- a/indra/newview/skins/default/xui/pl/floater_post_process.xml +++ b/indra/newview/skins/default/xui/pl/floater_post_process.xml @@ -16,40 +16,40 @@ </text> <slider label="" name="wmiColorFilterContrast" /> <text name="wmiColorFilterBaseText"> - Kontrast Koloru Podstawowego + Kontrast koloru podstawowego </text> <slider label="R" name="wmiColorFilterBaseR" /> <slider label="G" name="wmiColorFilterBaseG" /> <slider label="B" name="wmiColorFilterBaseB" /> <slider label="I" name="wmiColorFilterBaseI" /> </panel> - <panel label="Wizja Nocna" name="wmiNightVisionPanel"> + <panel label="Wizja nocna" name="wmiNightVisionPanel"> <check_box label="Udostępnij" name="wmiNightVisionToggle" /> <text name="wmiNightVisionBrightMultText"> - Wielokrotne Wzmocnienie Światła + Wielokrotne wzmocnienie światła </text> <slider label="" name="wmiNightVisionBrightMult" /> <text name="wmiNightVisionNoiseSizeText"> - Rozmiar Szumu + Rozmiar szumu </text> <slider label="" name="wmiNightVisionNoiseSize" /> <text name="wmiNightVisionNoiseStrengthText"> - Moc Szumu + Moc szumu </text> <slider label="" name="wmiNightVisionNoiseStrength" /> </panel> <panel label="Bloom" name="wmiBloomPanel"> <check_box label="Udostępnij" name="wmiBloomToggle" /> <text name="wmiBloomExtractText"> - Ekstracja Luminacji + Ekstracja luminacji </text> <slider label="" name="wmiBloomExtract" /> <text name="wmiBloomSizeText"> - Rozmiar Rozmazania Obrazu + Rozmiar rozmazania obrazu </text> <slider label="" name="wmiBloomSize" /> <text name="wmiBloomStrengthText"> - Moc Rozmazania Obrazu + Moc rozmazania obrazu </text> <slider label="" name="wmiBloomStrength" /> </panel> diff --git a/indra/newview/skins/default/xui/pl/floater_postcard.xml b/indra/newview/skins/default/xui/pl/floater_postcard.xml index 362483e2fd..095974aa61 100644 --- a/indra/newview/skins/default/xui/pl/floater_postcard.xml +++ b/indra/newview/skins/default/xui/pl/floater_postcard.xml @@ -20,7 +20,7 @@ Wpisz treść swojej wiadomości tutaj </text_editor> <text name="fine_print"> - Jeżeli odbiorca tej pocztówki dołączy do [SECOND_LIFE], otrzymasz bonusa. + Jeżeli Odbiorca tej pocztówki dołączy do [SECOND_LIFE], otrzymasz bonus. </text> <button label="Anuluj" name="cancel_btn"/> <button label="Wyślij" name="send_btn"/> diff --git a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml index 386d703eb3..6ce6914771 100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_animation.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_animation.xml @@ -6,6 +6,6 @@ <text name="desc txt"> Opis: </text> - <button label="Uruchom in-world" label_selected="Stop" left="20" name="Anim play btn" tool_tip="Uruchom tę animację by widzieli ją pozostali Rezydenci" width="131"/> - <button label="Używaj lokalnie" label_selected="Stop" left="162" name="Anim audition btn" tool_tip="Uruchom tę animację widoczną tylko przez Ciebie" width="125"/> + <button label="Uruchom in-world" label_selected="Stop" left="20" name="Anim play btn" tool_tip="Uruchom animację by widzieli ją pozostali Rezydenci" width="131"/> + <button label="Używaj lokalnie" label_selected="Stop" left="162" name="Anim audition btn" tool_tip="Uruchom animację widoczną tylko przez Ciebie" width="125"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_preview_event.xml b/indra/newview/skins/default/xui/pl/floater_preview_event.xml index 180cdea6e8..5d9e47bc00 100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_event.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_event.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="event_preview" title="INFORMACJE O IMPREZIE"> +<floater name="event_preview" title="INFO O IMPREZIE"> <floater.string name="Title"> Impreza: [NAME] </floater.string> diff --git a/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml b/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml index ba4fa736b1..05758ac04d 100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_gesture.xml @@ -22,7 +22,7 @@ -- Brak -- </floater.string> <floater.string name="Title"> - Gestura: [NAME] + Gest: [NAME] </floater.string> <text name="name_text"> Nazwa: @@ -50,8 +50,8 @@ <text name="steps_label"> Etapy: </text> - <button label="W Górę" name="up_btn"/> - <button label="W Dół" name="down_btn"/> + <button label="W górę" name="up_btn"/> + <button label="W dół" name="down_btn"/> <button label="Usuń" name="delete_btn"/> <radio_group name="animation_trigger_type"> <radio_item label="Start" name="start"/> diff --git a/indra/newview/skins/default/xui/pl/floater_preview_gesture_info.xml b/indra/newview/skins/default/xui/pl/floater_preview_gesture_info.xml index 8f760d5085..d31cada96d 100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_gesture_info.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_gesture_info.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Gesture" title="GESTURA"/> +<floater name="Gesture" title="GEST"/> diff --git a/indra/newview/skins/default/xui/pl/floater_preview_gesture_shortcut.xml b/indra/newview/skins/default/xui/pl/floater_preview_gesture_shortcut.xml index 2dc9917435..d33b799476 100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_gesture_shortcut.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_gesture_shortcut.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Gesture" title="GESTURY"> +<floater name="Gesture" title="GESTY"> <text name="trigger_label"> Czat: </text> diff --git a/indra/newview/skins/default/xui/pl/floater_preview_gesture_steps.xml b/indra/newview/skins/default/xui/pl/floater_preview_gesture_steps.xml index 74fb0c258e..6592d9dad0 100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_gesture_steps.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_gesture_steps.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="Gesture" title="GESTURY"/> +<floater name="Gesture" title="GESTY"/> diff --git a/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml b/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml index eb8b5c1a46..1ad07c236b 100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_notecard.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="preview notecard" title="NOTA:"> <floater.string name="no_object"> - Nie można znaleść obiektu zawierającego tą notkę. + Nie można znaleźć obiektu zawierającego tą notkę. </floater.string> <floater.string name="not_allowed"> Nie masz pozwolenia na zobaczenie tej notki. diff --git a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml index 230f432e09..d02b3ca75e 100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_sound.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_sound.xml @@ -7,5 +7,5 @@ Opis: </text> <button label="Odtwarzaj" label_selected="Odtwarzaj" left_delta="-136" name="Sound play btn" tool_tip="Dźwięk będzie słyszalny przez wszystkich." width="130"/> - <button label="Odtwarzaj Lokalnie" label_selected="Odtwarzaj Lokalnie" name="Sound audition btn" tool_tip="Dźwięk będzie słyszalny tylko dla Ciebie."/> + <button label="Odtwarzaj Lokalnie" label_selected="Odtwarzaj lokalnie" name="Sound audition btn" tool_tip="Dźwięk będzie słyszalny tylko dla Ciebie."/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_preview_texture.xml b/indra/newview/skins/default/xui/pl/floater_preview_texture.xml index 698a63e74a..e58acee139 100644 --- a/indra/newview/skins/default/xui/pl/floater_preview_texture.xml +++ b/indra/newview/skins/default/xui/pl/floater_preview_texture.xml @@ -13,13 +13,13 @@ [WIDTH]px x [HEIGHT]px </text> <text name="aspect_ratio"> - Zobacz Proporcje + Zobacz proporcje </text> <combo_box name="combo_aspect_ratio" tool_tip="Wyświetl w domyślnych proporcjach"> <combo_item name="Unconstrained"> Swobodny </combo_item> - <combo_item name="1:1" tool_tip="Insygnia Grupy lub Realny Profil"> + <combo_item name="1:1" tool_tip="Insygnia Grupy lub realny Profil"> 1:1 </combo_item> <combo_item name="4:3" tool_tip="[SECOND_LIFE] profil"> diff --git a/indra/newview/skins/default/xui/pl/floater_region_info.xml b/indra/newview/skins/default/xui/pl/floater_region_info.xml index ae00f90f16..a1f7785f48 100644 --- a/indra/newview/skins/default/xui/pl/floater_region_info.xml +++ b/indra/newview/skins/default/xui/pl/floater_region_info.xml @@ -1,2 +1,2 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<floater name="regioninfo" title="REGION/ESTATE"/> +<floater name="regioninfo" title="REGION/MAJĄTEK"/> diff --git a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml index 18ce1b230f..a6f8ba6c11 100644 --- a/indra/newview/skins/default/xui/pl/floater_report_abuse.xml +++ b/indra/newview/skins/default/xui/pl/floater_report_abuse.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater_report_abuse" title="RAPORT O NADUŻYCIU"> <floater.string name="Screenshot"> - Zdjęcie Ekranu + Zdjęcie ekranu </floater.string> <check_box label="Załącz zdjęcie do raportu" name="screen_check"/> <text name="reporter_title"> @@ -40,42 +40,42 @@ </text> <combo_box name="category_combo" tool_tip="Wybór kategorii - wybierz kategorię, której dotyczy raport"> <combo_box.item label="Wybierz Kategorię:" name="Select_category"/> - <combo_box.item label="Wiek > Udawanie Nieletniej Osoby" name="Age__Age_play"/> + <combo_box.item label="Wiek > Udawanie nieletniej osoby" name="Age__Age_play"/> <combo_box.item label="Wiek > Dorosły Rezydent w Teen Second Life" name="Age__Adult_resident_on_Teen_Second_Life"/> <combo_box.item label="Wiek > Nieletni Rezydent poza Teen Second Life" name="Age__Underage_resident_outside_of_Teen_Second_Life"/> - <combo_box.item label="Napaść > Strefa Militarna / Niebezpieczny Obszar" name="Assault__Combat_sandbox___unsafe_area"/> - <combo_box.item label="Napaść > Bezpieczny Obszar" name="Assault__Safe_area"/> - <combo_box.item label="Napaść > Obszar do Testowania Broni" name="Assault__Weapons_testing_sandbox"/> - <combo_box.item label="Handel > Niedostarczenie Produktu lub Usługi" name="Commerce__Failure_to_deliver_product_or_service"/> - <combo_box.item label="Naruszenie Prywatności > Dane Osobiste" name="Disclosure__Real_world_information"/> - <combo_box.item label="Ujawnienie > Monitorowanie Czatu" name="Disclosure__Remotely_monitoring chat"/> - <combo_box.item label="Ujawnienie > Dane z Second Life / Czatu / IM" name="Disclosure__Second_Life_information_chat_IMs"/> - <combo_box.item label="Zakłócanie Spokoju > Nieuczciwe Używanie Zasobów Regionu" name="Disturbing_the_peace__Unfair_use_of_region_resources"/> - <combo_box.item label="Zakłócanie Spokoju > Przesadnie Skryptowane Obiekty" name="Disturbing_the_peace__Excessive_scripted_objects"/> - <combo_box.item label="Zakłócanie Spokoju > Śmiecenie Obiektami" name="Disturbing_the_peace__Object_littering"/> - <combo_box.item label="Zakłócanie Spokoju > Ciągły Spam" name="Disturbing_the_peace__Repetitive_spam"/> - <combo_box.item label="Zakłócanie Spokoju > Nieporządany Spam Reklamowy" name="Disturbing_the_peace__Unwanted_advert_spam"/> + <combo_box.item label="Napaść > strefa militarna / niebezpieczny obszar" name="Assault__Combat_sandbox___unsafe_area"/> + <combo_box.item label="Napaść > nezpieczny obszar" name="Assault__Safe_area"/> + <combo_box.item label="Napaść > obszar do testowania broni" name="Assault__Weapons_testing_sandbox"/> + <combo_box.item label="Handel > niedostarczenie produktu lub usługi" name="Commerce__Failure_to_deliver_product_or_service"/> + <combo_box.item label="Naruszenie prywatności > dane osobiste" name="Disclosure__Real_world_information"/> + <combo_box.item label="Ujawnienie > monitorowanie czatu" name="Disclosure__Remotely_monitoring chat"/> + <combo_box.item label="Ujawnienie > dane z Second Life / Czatu / IM" name="Disclosure__Second_Life_information_chat_IMs"/> + <combo_box.item label="Zakłócanie spokoju > nieuczciwe używanie zasobów Regionu" name="Disturbing_the_peace__Unfair_use_of_region_resources"/> + <combo_box.item label="Zakłócanie spokoju > przesadnie skryptowane obiekty" name="Disturbing_the_peace__Excessive_scripted_objects"/> + <combo_box.item label="Zakłócanie spokoju > śmiecenie obiektami" name="Disturbing_the_peace__Object_littering"/> + <combo_box.item label="Zakłócanie spokoju > ciągły spam" name="Disturbing_the_peace__Repetitive_spam"/> + <combo_box.item label="Zakłócanie spokoju > nieporządany spam reklamowy" name="Disturbing_the_peace__Unwanted_advert_spam"/> <combo_box.item label="Oszustwo > L$" name="Fraud__L$"/> <combo_box.item label="Oszustwo > Posiadłości" name="Fraud__Land"/> - <combo_box.item label="Oszustwo > Piramidy albo Listy Łańcuchowe" name="Fraud__Pyramid_scheme_or_chain_letter"/> + <combo_box.item label="Oszustwo > piramidy albo listy łańcuchowe" name="Fraud__Pyramid_scheme_or_chain_letter"/> <combo_box.item label="Oszustwo > US$" name="Fraud__US$"/> - <combo_box.item label="Prześladowanie > Farmy Reklamowe / Wizualny Spam" name="Harassment__Advert_farms___visual_spam"/> - <combo_box.item label="Prześladowanie > Zniesławianie Jedostek lub Grup" name="Harassment__Defaming_individuals_or_groups"/> - <combo_box.item label="Prześladowanie > Ograniczanie Ruchu" name="Harassment__Impeding_movement"/> - <combo_box.item label="Prześladowanie > Molestowanie Seksualne" name="Harassment__Sexual_harassment"/> - <combo_box.item label="Prześladowanie > Namawianie/Zachęcanie Innych do Łamania Warunków Umowy (ToS)" name="Harassment__Solicting_inciting_others_to_violate_ToS"/> + <combo_box.item label="Prześladowanie > farmy reklamowe / wizualny spam" name="Harassment__Advert_farms___visual_spam"/> + <combo_box.item label="Prześladowanie > zniesławianie jedostek lub grup" name="Harassment__Defaming_individuals_or_groups"/> + <combo_box.item label="Prześladowanie > Ograniczanie ruchu" name="Harassment__Impeding_movement"/> + <combo_box.item label="Prześladowanie > Molestowanie seksualne" name="Harassment__Sexual_harassment"/> + <combo_box.item label="Prześladowanie > Namawianie/Zachęcanie innych do łamania warunków umowy (ToS)" name="Harassment__Solicting_inciting_others_to_violate_ToS"/> <combo_box.item label="Prześladowanie > Znieważanie Słowne" name="Harassment__Verbal_abuse"/> - <combo_box.item label="Nieprzyzwoitość > Obraźliwa Treść lub Postępowanie" name="Indecency__Broadly_offensive_content_or_conduct"/> - <combo_box.item label="Nieprzyzwoitość > Niestosowne Imię Awatara" name="Indecency__Inappropriate_avatar_name"/> - <combo_box.item label="Nieprzyzwoitość > Obraźliwa treść i postępowanie w regionie 'PG'" name="Indecency__Mature_content_in_PG_region"/> - <combo_box.item label="Nieprzyzwoitość > Obraźliwa treść i postępowanie w regionie 'Mature'" name="Indecency__Inappropriate_content_in_Mature_region"/> - <combo_box.item label="Naruszenie Własności Intelektualnej > Usunięcie Treści" name="Intellectual_property_infringement_Content_Removal"/> - <combo_box.item label="Naruszenie Własności Intelektualnej > CopyBot albo Nadużycie Przywilejów" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"/> + <combo_box.item label="Nieprzyzwoitość > Obraźliwa treść lub postępowanie" name="Indecency__Broadly_offensive_content_or_conduct"/> + <combo_box.item label="Nieprzyzwoitość > Niestosowne imię awatara" name="Indecency__Inappropriate_avatar_name"/> + <combo_box.item label="Nieprzyzwoitość > Obraźliwa treść i postępowanie w Regionie 'PG'" name="Indecency__Mature_content_in_PG_region"/> + <combo_box.item label="Nieprzyzwoitość > Obraźliwa treść i postępowanie w Regionie 'Mature'" name="Indecency__Inappropriate_content_in_Mature_region"/> + <combo_box.item label="Naruszenie własności intelektualnej > usunięcie treści" name="Intellectual_property_infringement_Content_Removal"/> + <combo_box.item label="Naruszenie własności intelektualnej > CopyBot albo nadużycie przywilejów" name="Intellectual_property_infringement_CopyBot_or_Permissions_Exploit"/> <combo_box.item label="Nietolerancja" name="Intolerance"/> - <combo_box.item label="Posiadłości > Nadużywanie Piaskownicy" name="Land__Abuse_of_sandbox_resources"/> - <combo_box.item label="Posiadłości > Naruszenie > Obiekty/Tekstury" name="Land__Encroachment__Objects_textures"/> - <combo_box.item label="Posiadłości > Naruszenie > Cząsteczki" name="Land__Encroachment__Particles"/> - <combo_box.item label="Posiadłości > Naruszenie > Drzewa/Rośliny" name="Land__Encroachment__Trees_plants"/> + <combo_box.item label="Posiadłości > nadużywanie piaskownicy" name="Land__Abuse_of_sandbox_resources"/> + <combo_box.item label="Posiadłości > naruszenie > obiekty/tekstury" name="Land__Encroachment__Objects_textures"/> + <combo_box.item label="Posiadłości > naruszenie > cząsteczki" name="Land__Encroachment__Particles"/> + <combo_box.item label="Posiadłości > naruszenie > drzewa/rośliny" name="Land__Encroachment__Trees_plants"/> <combo_box.item label="Zakłady/Hazard" name="Wagering_gambling"/> <combo_box.item label="Inne" name="Other"/> </combo_box> diff --git a/indra/newview/skins/default/xui/pl/floater_script_queue.xml b/indra/newview/skins/default/xui/pl/floater_script_queue.xml index c20decdd00..bdfdba569e 100644 --- a/indra/newview/skins/default/xui/pl/floater_script_queue.xml +++ b/indra/newview/skins/default/xui/pl/floater_script_queue.xml @@ -7,7 +7,7 @@ Wykonane. </floater.string> <floater.string name="Resetting"> - Trwa reset + Trwa resetowanie </floater.string> <floater.string name="Running"> Skrypt działa diff --git a/indra/newview/skins/default/xui/pl/floater_script_search.xml b/indra/newview/skins/default/xui/pl/floater_script_search.xml index a2812406a4..cb010daee4 100644 --- a/indra/newview/skins/default/xui/pl/floater_script_search.xml +++ b/indra/newview/skins/default/xui/pl/floater_script_search.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="script search" title="SZUKAJ SKRYPTU"> - <check_box label="CapsLoock Nieaktywny" name="case_text"/> + <check_box label="CapsLoock nieaktywny" name="case_text"/> <button label="Szukaj" label_selected="Szukaj" name="search_btn"/> <button label="Zamień" label_selected="Zamień" name="replace_btn"/> - <button label="Zamień Wszystko" label_selected="Zamień Wszystko" name="replace_all_btn"/> + <button label="Zamień Wszystko" label_selected="Zamień wszystko" name="replace_all_btn"/> <text name="txt"> Szukaj </text> diff --git a/indra/newview/skins/default/xui/pl/floater_sell_land.xml b/indra/newview/skins/default/xui/pl/floater_sell_land.xml index 1670becbbb..eb1ed74797 100644 --- a/indra/newview/skins/default/xui/pl/floater_sell_land.xml +++ b/indra/newview/skins/default/xui/pl/floater_sell_land.xml @@ -58,7 +58,7 @@ <text name="nag_message_label"> PAMIĘTAJ: Sprzedaż jest nieodwracalna. </text> - <button label="Wystaw Ziemię na Sprzedaż" name="sell_btn"/> + <button label="Wystaw ziemię na sprzedaż" name="sell_btn"/> <button label="Anuluj" name="cancel_btn"/> </panel> </scroll_container> diff --git a/indra/newview/skins/default/xui/pl/floater_snapshot.xml b/indra/newview/skins/default/xui/pl/floater_snapshot.xml index 0b15727daa..df4e5b43bc 100644 --- a/indra/newview/skins/default/xui/pl/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/pl/floater_snapshot.xml @@ -11,7 +11,7 @@ <text name="file_size_label"> [SIZE] KB </text> - <button label="Odśwież Zdjęcie" name="new_snapshot_btn"/> + <button label="Odśwież zdjęcie" name="new_snapshot_btn"/> <button label="Wyślij" name="send_btn"/> <button label="Załaduj (L$[AMOUNT])" name="upload_btn"/> <flyout_button label="Zapisz" name="save_btn" tool_tip="Zapisz zdjęcie na dysk"> @@ -66,7 +66,7 @@ <combo_box label="Warstwy Obrazu" name="layer_types"> <combo_box.item label="Kolory" name="Colors"/> <combo_box.item label="Głębokość" name="Depth"/> - <combo_box.item label="Obiekty Ślepe" name="ObjectMattes"/> + <combo_box.item label="Obiekty ślepe" name="ObjectMattes"/> </combo_box> <check_box label="Pokaż interfejs na zdjęciu" name="ui_check"/> <check_box label="Pokaż obiekty HUD na zdjęciu" name="hud_check"/> diff --git a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml index c66ac0a98f..ac041dff6a 100644 --- a/indra/newview/skins/default/xui/pl/floater_sound_preview.xml +++ b/indra/newview/skins/default/xui/pl/floater_sound_preview.xml @@ -7,5 +7,5 @@ Opis: </text> <button label="Anuluj" label_selected="Anuluj" name="cancel_btn"/> - <button label="Załaduj (L$[AMOUNT])" label_selected="Załaduj (L$[AMOUNT])" name="ok_btn"/> + <button label="Załaduj ([AMOUNT]L$)" label_selected="Załaduj ([AMOUNT]L$)" name="ok_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_stats.xml b/indra/newview/skins/default/xui/pl/floater_stats.xml index acd3df0585..ee5fba4d63 100644 --- a/indra/newview/skins/default/xui/pl/floater_stats.xml +++ b/indra/newview/skins/default/xui/pl/floater_stats.xml @@ -3,17 +3,17 @@ <scroll_container name="statistics_scroll"> <container_view name="statistics_view"> <stat_view label="Podstawowe" name="basic"> - <stat_bar label="Ilość Obrazów/Sec (FPS)" name="fps"/> + <stat_bar label="Ilość obrazów/sek (FPS)" name="fps"/> <stat_bar label="Przepustowość" name="bandwidth"/> - <stat_bar label="Stracone Pakiety" name="packet_loss"/> - <stat_bar label="Ping Sim" name="ping"/> + <stat_bar label="Stracone pakiety" name="packet_loss"/> + <stat_bar label="Ping sim" name="ping"/> </stat_view> <stat_view label="Zaawansowane" name="advanced"> <stat_view label="Renderuj" name="render"> <stat_bar label="KTris Drawn" name="ktrisframe"/> <stat_bar label="KTris Drawn" name="ktrissec"/> - <stat_bar label="Wszystkie Obiekty" name="objs"/> - <stat_bar label="Nowe Obiekty" name="newobjs"/> + <stat_bar label="Wszystkie obiekty" name="objs"/> + <stat_bar label="Nowe obiekty" name="newobjs"/> </stat_view> <stat_view label="Tekstura" name="texture"> <stat_bar label="Suma" name="numimagesstat"/> @@ -24,8 +24,8 @@ <stat_bar label="Bound Mem" name="glboundmemstat"/> </stat_view> <stat_view label="Sieć" name="network"> - <stat_bar label="Pakiety Wewnętrzne" name="packetsinstat"/> - <stat_bar label="Pakiety Zewnętrzne" name="packetsoutstat"/> + <stat_bar label="Pakiety wewnętrzne" name="packetsinstat"/> + <stat_bar label="Pakiety zewnętrzne" name="packetsoutstat"/> <stat_bar label="Obiekty" name="objectkbitstat"/> <stat_bar label="Tesktura" name="texturekbitstat"/> <stat_bar label="Asset" name="assetkbitstat"/> @@ -40,30 +40,30 @@ <stat_bar label="Ilość Obrazów/Sec na Symulatorze (Sim FPS)" name="simfps"/> <stat_bar label="Fizyka Obrazów/Sec" name="simphysicsfps"/> <stat_view label="Szczegóły Fizyki" name="physicsdetail"> - <stat_bar label="Pinned Objects" name="physicspinnedtasks"/> + <stat_bar label="Pinned objects" name="physicspinnedtasks"/> <stat_bar label="Niskie LOD Obiektów" name="physicslodtasks"/> - <stat_bar label="Alokacja Pamięci" name="physicsmemoryallocated"/> - <stat_bar label="Aktualizacja Agentów/Sec" name="simagentups"/> - <stat_bar label="Główni Agenci" name="simmainagents"/> - <stat_bar label="Child Agents" name="simchildagents"/> + <stat_bar label="Alokacja pamięci" name="physicsmemoryallocated"/> + <stat_bar label="Aktualizacja agentów/Sek" name="simagentups"/> + <stat_bar label="Główni agenci" name="simmainagents"/> + <stat_bar label="Child agents" name="simchildagents"/> <stat_bar label="Obiekty" name="simobjects"/> - <stat_bar label="Aktywne Obiekty" name="simactiveobjects"/> - <stat_bar label="Aktywne Skrypty" name="simactivescripts"/> - <stat_bar label="Wydarzenie Skryptowe" name="simscripteps"/> - <stat_bar label="Pakiety Wewnętrzne" name="siminpps"/> - <stat_bar label="Pakiety Zewnętrzne" name="simoutpps"/> - <stat_bar label="Oczekiwane na Pobranie" name="simpendingdownloads"/> - <stat_bar label="Oczekiwane na Załadowanie" name="simpendinguploads"/> - <stat_bar label="Wszystkie Niepotwierdzone Bity" name="simtotalunackedbytes"/> + <stat_bar label="Aktywne obiekty" name="simactiveobjects"/> + <stat_bar label="Aktywne skrypty" name="simactivescripts"/> + <stat_bar label="Wydarzenie skryptowe" name="simscripteps"/> + <stat_bar label="Pakiety wewnętrzne" name="siminpps"/> + <stat_bar label="Pakiety zewnętrzne" name="simoutpps"/> + <stat_bar label="Oczekiwane na pobranie" name="simpendingdownloads"/> + <stat_bar label="Oczekiwane na załadowanie" name="simpendinguploads"/> + <stat_bar label="Wszystkie niepotwierdzone bity" name="simtotalunackedbytes"/> </stat_view> <stat_view label="Czas (ms)" name="simperf"> - <stat_bar label="Całkowity Czas Obrazu" name="simframemsec"/> - <stat_bar label="Czas Sieciowy" name="simnetmsec"/> - <stat_bar label="Czas Fizyki" name="simsimphysicsmsec"/> - <stat_bar label="Czas Symulatora" name="simsimothermsec"/> - <stat_bar label="Czas Agenta" name="simagentmsec"/> - <stat_bar label="Czas Obrazu" name="simimagesmsec"/> - <stat_bar label="Czas Skryptu" name="simscriptmsec"/> + <stat_bar label="Całkowity czas obrazu" name="simframemsec"/> + <stat_bar label="Czas sieciowy" name="simnetmsec"/> + <stat_bar label="Czas fizyki" name="simsimphysicsmsec"/> + <stat_bar label="Czas symulatora" name="simsimothermsec"/> + <stat_bar label="Czas agenta" name="simagentmsec"/> + <stat_bar label="Czas obrazu" name="simimagesmsec"/> + <stat_bar label="Czas skryptu" name="simscriptmsec"/> </stat_view> </stat_view> </container_view> diff --git a/indra/newview/skins/default/xui/pl/floater_telehub.xml b/indra/newview/skins/default/xui/pl/floater_telehub.xml index f8a23a6fc3..32cc08810d 100644 --- a/indra/newview/skins/default/xui/pl/floater_telehub.xml +++ b/indra/newview/skins/default/xui/pl/floater_telehub.xml @@ -15,10 +15,10 @@ <button label="Połącz z teleporterem" name="connect_btn" width="132"/> <button label="Rozłącz" left="152" name="disconnect_btn" width="88"/> <text name="spawn_points_text" width="250"> - Punkty Składowe (pozycje - nie obiekty!): + Punkty składowe (pozycje - nie obiekty!): </text> - <button label="Dodaj Punkt" name="add_spawn_point_btn"/> - <button label="Usuń Punkt" name="remove_spawn_point_btn"/> + <button label="Dodaj punkt" name="add_spawn_point_btn"/> + <button label="Usuń punkt" name="remove_spawn_point_btn"/> <text name="spawn_point_help"> Wybierz obiekt i wybierz "Dodaj" by sprecyzować pozycję. Możesz przesunąć lub usunąć obiekt. diff --git a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml index 8464343ebb..52c0cb8a93 100644 --- a/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml +++ b/indra/newview/skins/default/xui/pl/floater_texture_ctrl.xml @@ -4,7 +4,7 @@ Kliknij by wybrać obraz </string> <text name="Multiple"> - Wiele Tekstur + Wiele tekstur </text> <text name="unknown"> Rozmiar: [DIMENSIONS] @@ -12,8 +12,8 @@ <button label="Domyślna" label_selected="Domyślna" name="Default"/> <button label="Żadna" label_selected="Żadna" name="None"/> <button label="Pusta" label_selected="Pusta" name="Blank"/> - <check_box label="Pokaż Foldery" name="show_folders_check"/> - <search_editor label="Filtruj Tektury" name="inventory search editor"/> + <check_box label="Pokaż foldery" name="show_folders_check"/> + <search_editor label="Filtruj tektury" name="inventory search editor"/> <check_box label="Zastosuj teraz" name="apply_immediate_check"/> <button label="" label_selected="" name="Pipette"/> <button label="Anuluj" label_selected="Anuluj" name="Cancel"/> diff --git a/indra/newview/skins/default/xui/pl/floater_tools.xml b/indra/newview/skins/default/xui/pl/floater_tools.xml index e355813f83..5bc3811ef6 100644 --- a/indra/newview/skins/default/xui/pl/floater_tools.xml +++ b/indra/newview/skins/default/xui/pl/floater_tools.xml @@ -154,10 +154,10 @@ Cena za: L$ </panel.string> <panel.string name="Cost Mixed"> - Cena Mieszana + Cena mieszana </panel.string> <panel.string name="Sale Mixed"> - Sprzedaż Mieszana + Sprzedaż mieszana </panel.string> <text name="Name:"> Nazwa: @@ -190,10 +190,10 @@ Kliknij: </text> <combo_box name="clickaction"> - <combo_box.item label="Dotknij (domyślne)" name="Touch/grab(default)"/> - <combo_box.item label="Usiądź na Obiekcie" name="Sitonobject"/> - <combo_box.item label="Kup Obiekt" name="Buyobject"/> - <combo_box.item label="Zapłać Obiektowi" name="Payobject"/> + <combo_box.item label="Dotknij (domyślne)" name="Touch/grab(default)"/> + <combo_box.item label="Usiądź na obiekcie" name="Sitonobject"/> + <combo_box.item label="Kup obiekt" name="Buyobject"/> + <combo_box.item label="Zapłać obiektowi" name="Payobject"/> <combo_box.item label="Otwórz" name="Open"/> <combo_box.item label="Przybliż" name="Zoom"/> </combo_box> @@ -215,11 +215,11 @@ <check_box label="Przesuń" name="checkbox allow everyone move"/> <check_box label="Kopiuj" name="checkbox allow everyone copy"/> <text name="Next owner can:"> - Następny właściciel: + Następny Właściciel: </text> <check_box label="Zmienia" name="checkbox next owner can modify"/> <check_box label="Kopiuje" name="checkbox next owner can copy"/> - <check_box label="Oddaje/Sprzedaje" name="checkbox next owner can transfer" tool_tip="Następny właściciel może oddawać lub sprzedawać ten obiekt"/> + <check_box label="Oddaje/Sprzedaje" name="checkbox next owner can transfer" tool_tip="Następny Właściciel może oddawać lub sprzedawać ten obiekt"/> <text name="B:"> B: </text> @@ -313,20 +313,20 @@ Zwężenie </text> <text name="scale_hole"> - Rozmiar Wgłębienia + Rozmiar wgłębienia </text> <spinner label="X" name="Taper Scale X"/> <spinner label="Y" name="Taper Scale Y"/> <text name="text topshear"> - Przesunięcie Górne + Przesunięcie górne </text> <spinner label="X" name="Shear X"/> <spinner label="Y" name="Shear Y"/> <text name="advanced_cut"> - Wykrojenie Przekroju (początek/koniec) + Wykrojenie przekroju (początek/koniec) </text> <text name="advanced_dimple"> - Przesunięcie Promienia (początek/koniec) + Przesunięcie promienia (początek/koniec) </text> <text name="advanced_slice"> Przetnij(początek/koniec) @@ -346,17 +346,17 @@ </text> <spinner name="Radius Offset"/> <spinner name="Revolutions"/> - <texture_picker label="Tekstura Skulptowa" name="sculpt texture control" tool_tip="Click to choose a picture"/> + <texture_picker label="Tekstura skulptowa" name="sculpt texture control" tool_tip="Click to choose a picture"/> <check_box label="Odbicie" name="sculpt mirror control" tool_tip="Odwraca skulpt wzdłuż osi X."/> <check_box label="Środek na zewnątrz" name="sculpt invert control" tool_tip="Odwraca normalne skulptu."/> <text name="label sculpt type"> - Typ Ścięgna + Typ ścięgna </text> <combo_box name="sculpt type control"> <combo_box.item label="(żadne)" name="None"/> <combo_box.item label="Kula" name="Sphere"/> <combo_box.item label="Torus" name="Torus"/> - <combo_box.item label="Płaczyzna" name="Plane"/> + <combo_box.item label="Płaszczyzna" name="Plane"/> <combo_box.item label="Walec" name="Cylinder"/> </combo_box> </panel> @@ -454,7 +454,7 @@ <spinner label="Powtórzenia / metr" name="rptctrl"/> <button label="Zastosuj" label_selected="Zastosuj" name="button apply"/> <text name="tex offset"> - Wyrównanie Tekstury + Wyrównanie tekstury </text> <spinner label="Poziome (U)" name="TexOffsetU"/> <spinner label="Pionowe (V)" name="TexOffsetV"/> @@ -469,7 +469,7 @@ </panel> </panel> <panel label="Treść" name="Contents"> - <button label="Nowy Skrypt" label_selected="Nowy Skrypt" name="button new script"/> + <button label="Nowy skrypt" label_selected="Nowy skrypt" name="button new script"/> <button label="Prawa" name="button permissions"/> </panel> </tab_container> @@ -484,13 +484,13 @@ Obszar: [AREA] m² </text> <button label="O Posiadłości" label_selected="O Posiadłości" name="button about land"/> - <check_box label="Pokaż Właścicieli" name="checkbox show owners" tool_tip="Pokoloruj posiadłości zgodnie z przynależnością do właściciela: + <check_box label="Pokaż Właścicieli" name="checkbox show owners" tool_tip="Pokoloruj Posiadłości zgodnie z przynależnością do Właściciela: Zielony = Twoja Posiadłość Morski = Posiadłość Twojej Grupy -Czerwony = Posiadłości Innych -Żółty = Na Sprzedaż -Fioletowy = Na Aukcję +Czerwony = Posiadłości innych +Żółty = Na sprzedaż +Fioletowy = Na aukcję Szary = Publiczna"/> <text name="label_parcel_modify"> Modyfikuj Posiadłość @@ -498,7 +498,7 @@ Szary = Publiczna"/> <button label="Podziel" label_selected="Podziel" name="button subdivide land"/> <button label="Złącz" label_selected="Złącz" name="button join land"/> <text name="label_parcel_trans"> - Transakcje na posiadłości + Transakcje na Posiadłości </text> <button label="Kup Posiadłość" label_selected="Kup Posiadłość" name="button buy land"/> <button label="Porzuć Posiadłość" label_selected="Porzuć Posiadłość" name="button abandon land"/> diff --git a/indra/newview/skins/default/xui/pl/floater_top_objects.xml b/indra/newview/skins/default/xui/pl/floater_top_objects.xml index 8d41e0fb13..6afbce7e10 100644 --- a/indra/newview/skins/default/xui/pl/floater_top_objects.xml +++ b/indra/newview/skins/default/xui/pl/floater_top_objects.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="top_objects" title="Główne Obiekty"> <floater.string name="top_scripts_title"> - Główne Skrypty + Główne skrypty </floater.string> <floater.string name="top_scripts_text"> [COUNT] skryptów działa w czasie [TIME] ms @@ -13,7 +13,7 @@ Mono Time </floater.string> <floater.string name="top_colliders_title"> - Główne Kolizje + Główne kolizje </floater.string> <floater.string name="top_colliders_text"> [COUNT] obiektów odczuwa działanie wielu potencjalnych kolizji @@ -22,7 +22,7 @@ Wynik </floater.string> <floater.string name="none_descriptor"> - Nie odnalezione + Nieodnalezione </floater.string> <text name="title_text"> Ładowanie... @@ -37,11 +37,11 @@ <scroll_list.columns label="URL" name="URLs"/> </scroll_list> <text name="id_text"> - ID Obiektu: + ID obiektu: </text> - <button label="Pokaż Emitery" name="show_beacon_btn"/> + <button label="Pokaż emitery" name="show_beacon_btn"/> <text name="obj_name_text"> - Nazwa Obiektu: + Nazwa obiektu: </text> <button label="Filtr" name="filter_object_btn"/> <text name="owner_name_text"> @@ -49,8 +49,8 @@ </text> <button label="Filter" name="filter_owner_btn"/> <button label="Odśwież" name="refresh_btn"/> - <button label="Zwróć Wybrane" name="return_selected_btn"/> - <button label="Zwróć Wszystko" name="return_all_btn"/> - <button label="Deaktywuj Wybrane" name="disable_selected_btn"/> - <button label="Deaktywuj Wszystko" name="disable_all_btn"/> + <button label="Zwróć wybrane" name="return_selected_btn"/> + <button label="Zwróć wszystko" name="return_all_btn"/> + <button label="Deaktywuj wybrane" name="disable_selected_btn"/> + <button label="Deaktywuj wszystko" name="disable_all_btn"/> </floater> diff --git a/indra/newview/skins/default/xui/pl/floater_voice_controls.xml b/indra/newview/skins/default/xui/pl/floater_voice_controls.xml index 27e2611952..6bee3e911c 100644 --- a/indra/newview/skins/default/xui/pl/floater_voice_controls.xml +++ b/indra/newview/skins/default/xui/pl/floater_voice_controls.xml @@ -17,7 +17,7 @@ </string> <layout_stack name="my_call_stack"> <layout_panel name="my_panel"> - <text name="user_text" value="Mój Awatar:"/> + <text name="user_text" value="Mój awatar:"/> </layout_panel> <layout_panel name="leave_call_btn_panel"> <button label="Zakończ" name="leave_call_btn"/> diff --git a/indra/newview/skins/default/xui/pl/floater_water.xml b/indra/newview/skins/default/xui/pl/floater_water.xml index 5ea5dbdd0e..9720dae516 100644 --- a/indra/newview/skins/default/xui/pl/floater_water.xml +++ b/indra/newview/skins/default/xui/pl/floater_water.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="Water Floater" title="ZAAWANSOWANY EDYTOR WODY"> <text name="KeyFramePresetsText"> - Ustawienia Wody: + Ustawienia wody: </text> <button label="Nowe" label_selected="Nowe" name="WaterNewPreset"/> <button label="Zapisz" label_selected="Zapisz" name="WaterSavePreset"/> @@ -9,22 +9,22 @@ <tab_container name="Water Tabs"> <panel label="USTAWIENIA" name="Settings"> <text name="BHText"> - Kolor Podwodnej Mgły + Kolor podwodnej mgły </text> <button label="?" name="WaterFogColorHelp"/> <color_swatch label="" name="WaterFogColor" tool_tip="Kliknij aby wybrać kolor"/> <text name="WaterFogDensText"> - Wykładnik Gęstości Mgły + Wykładnik gęstości mgły </text> <button label="?" name="WaterFogDensityHelp"/> <slider label="" name="WaterFogDensity"/> <text name="WaterUnderWaterFogModText"> - Modyfikator Mgły + Modyfikator mgły </text> <button label="?" name="WaterUnderWaterFogModHelp"/> <slider label="" name="WaterUnderWaterFogMod"/> <text name="BDensText"> - Skala Zmarszczeń + Skala zmarszczeń </text> <button label="?" name="WaterNormalScaleHelp"/> <text name="BHText2"> @@ -50,24 +50,24 @@ <button label="?" name="WaterFresnelOffsetHelp"/> <slider label="" name="WaterFresnelOffset"/> <text name="DensMultText"> - Górna Refrakcja + Górna refrakcja </text> <button label="?" name="WaterScaleAboveHelp"/> <slider label="" name="WaterScaleAbove"/> <text name="WaterScaleBelowText"> - Dolna Refrakcja + Dolna refrakcja </text> <button label="?" name="WaterScaleBelowHelp"/> <slider label="" name="WaterScaleBelow"/> <text name="MaxAltText"> - Mnożnik Rozmycia + Mnożnik rozmycia </text> <button label="?" name="WaterBlurMultiplierHelp"/> <slider label="" name="WaterBlurMult"/> </panel> <panel label="OBRAZ" name="Waves"> <text name="BHText"> - Kierunek Dużych Fal + Kierunek dużych fal </text> <button label="?" name="WaterWave1Help"/> <text name="WaterWave1DirXText"> @@ -79,7 +79,7 @@ <slider label="" name="WaterWave1DirX"/> <slider label="" name="WaterWave1DirY"/> <text name="BHText2"> - Kierunek Małych Fal + Kierunek małych fal </text> <button label="?" name="WaterWave2Help"/> <text name="WaterWave2DirXText"> @@ -91,7 +91,7 @@ <slider label="" name="WaterWave2DirX"/> <slider label="" name="WaterWave2DirY"/> <text name="BHText3"> - Mapa Normalnych + Mapa normalnych </text> <button label="?" name="WaterNormalMapHelp"/> <texture_picker label="" name="WaterNormalMap"/> diff --git a/indra/newview/skins/default/xui/pl/floater_wearable_save_as.xml b/indra/newview/skins/default/xui/pl/floater_wearable_save_as.xml index 42a67995f6..925295102e 100644 --- a/indra/newview/skins/default/xui/pl/floater_wearable_save_as.xml +++ b/indra/newview/skins/default/xui/pl/floater_wearable_save_as.xml @@ -3,7 +3,7 @@ <button label="Zapisz" label_selected="Zapisz" name="Save"/> <button label="Anuluj" label_selected="Anuluj" name="Cancel"/> <text name="Save item as:"> - Zapisz obiekt w mojej szafie jako: + Zapisz obiekt w mojej Szafie jako: </text> <line_editor name="name ed"> Nowe [DESC] diff --git a/indra/newview/skins/default/xui/pl/floater_windlight_options.xml b/indra/newview/skins/default/xui/pl/floater_windlight_options.xml index 6de121a180..49e523fae8 100644 --- a/indra/newview/skins/default/xui/pl/floater_windlight_options.xml +++ b/indra/newview/skins/default/xui/pl/floater_windlight_options.xml @@ -1,16 +1,16 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="WindLight floater" title="ZAAWANSOWANY EDYTOR NIEBA"> <text name="KeyFramePresetsText"> - Ustawienia Nieba: + Ustawienia nieba: </text> <button label="Nowe" label_selected="Nowe" name="WLNewPreset"/> <button label="Zapisz" label_selected="Zapisz" name="WLSavePreset"/> <button label="Usuń" label_selected="Usuń" name="WLDeletePreset"/> - <button label="Edytor Cyklu Dnia" label_selected="Edytor Cyklu Dnia" name="WLDayCycleMenuButton"/> + <button label="Edytor cyklu dnia" label_selected="Edytor cyklu dnia" name="WLDayCycleMenuButton"/> <tab_container name="WindLight Tabs"> <panel label="ATMOSFERA" name="Atmosphere"> <text name="BHText"> - Horyzont Błękitu + Horyzont błękitu </text> <button label="?" name="WLBlueHorizonHelp"/> <text name="BHText2"> @@ -30,12 +30,12 @@ <slider label="" name="WLBlueHorizonB"/> <slider label="" name="WLBlueHorizonI"/> <text name="BDensText"> - Horyzont Zamglenia + Horyzont zamglenia </text> <button label="?" name="WLHazeHorizonHelp"/> <slider label="" name="WLHazeHorizon"/> <text name="BDensText2"> - Gęstość Błękitu + Gęstość błękitu </text> <button label="?" name="WLBlueDensityHelp"/> <text name="BHText6"> @@ -55,29 +55,29 @@ <slider label="" name="WLBlueDensityB"/> <slider label="" name="WLBlueDensityI"/> <text name="HDText"> - Gęstość Zamglenia + Gęstość zamglenia </text> <button label="?" name="WLHazeDensityHelp"/> <slider label="" name="WLHazeDensity"/> <text name="DensMultText"> - Mnożnik Gęsości + Mnożnik gęsości </text> <button label="?" name="WLDensityMultHelp"/> <slider label="" name="WLDensityMult"/> <text name="WLDistanceMultText"> - Mnożnik Dystansu + Mnożnik dystansu </text> <button label="?" name="WLDistanceMultHelp"/> <slider label="" name="WLDistanceMult"/> <text name="MaxAltText"> - Max Wysokość + Max wysokość </text> <button label="?" name="WLMaxAltitudeHelp"/> <slider label="" name="WLMaxAltitude"/> </panel> <panel label="ŚWIATŁO" name="Lighting"> <text name="SLCText"> - Kolor Słońca/Księżyca + Kolor słońca/księżyca </text> <button label="?" name="WLSunlightColorHelp"/> <text name="BHText"> @@ -97,7 +97,7 @@ <slider label="" name="WLSunlightB"/> <slider label="" name="WLSunlightI"/> <text name="TODText"> - Pozycja Słońca/Księżyca + Pozycja słońca/księżyca </text> <button label="?" name="WLTimeOfDayHelp"/> <slider label="" name="WLSunAngle"/> @@ -122,30 +122,30 @@ <slider label="" name="WLAmbientB"/> <slider label="" name="WLAmbientI"/> <text name="WLEastAngleText"> - Pozycja Wschodu + Pozycja wschodu </text> <button label="?" name="WLEastAngleHelp"/> <slider label="" name="WLEastAngle"/> <text name="SunGlowText"> - Blask Słońca + Blask słońca </text> <button label="?" name="WLSunGlowHelp"/> <slider label="Ostrość" name="WLGlowB"/> <slider label="Rozmiar" name="WLGlowR"/> <text name="SceneGammaText"> - Jasność Obrazu + Jasność obrazu </text> <button label="?" name="WLSceneGammaHelp"/> <slider label="" name="WLGamma"/> <text name="WLStarText"> - Blask Gwiazd + Blask gwiazd </text> <button label="?" name="WLStarBrightnessHelp"/> <slider label="" name="WLStarAlpha"/> </panel> <panel label="CHMURY" name="Clouds"> <text name="WLCloudColorText"> - Kolor Chmur + Kolor chmur </text> <button label="?" name="WLCloudColorHelp"/> <text name="BHText"> @@ -181,17 +181,17 @@ <slider label="" name="WLCloudY"/> <slider label="" name="WLCloudDensity"/> <text name="WLCloudCoverageText"> - Pokrycie Chmur + Pokrycie chmur </text> <button label="?" name="WLCloudCoverageHelp"/> <slider label="" name="WLCloudCoverage"/> <text name="WLCloudScaleText"> - Skala Chmur + Skala chmur </text> <button label="?" name="WLCloudScaleHelp"/> <slider label="" name="WLCloudScale"/> <text name="WLCloudDetailText"> - Szczegóły (XY/Gęstość) + Szczegóły (XY/gęstość) </text> <button label="?" name="WLCloudDetailHelp"/> <text name="BHText8"> @@ -207,18 +207,18 @@ <slider label="" name="WLCloudDetailY"/> <slider label="" name="WLCloudDetailDensity"/> <text name="WLCloudScrollXText"> - Przewijanie Chmur X + Przewijanie chmur X </text> <button label="?" name="WLCloudScrollXHelp"/> <check_box label="Zablokuj" name="WLCloudLockX"/> <slider label="" name="WLCloudScrollX"/> <text name="WLCloudScrollYText"> - Przewijanie Chmur Y + Przewijanie chmur Y </text> <button label="?" name="WLCloudScrollYHelp"/> <check_box label="Zablokuj" name="WLCloudLockY"/> <slider label="" name="WLCloudScrollY"/> - <check_box label="Klasyczne Chmury" name="DrawClassicClouds"/> + <check_box label="Klasyczne chmury" name="DrawClassicClouds"/> <button label="?" name="WLClassicCloudsHelp"/> </panel> </tab_container> diff --git a/indra/newview/skins/default/xui/pl/floater_world_map.xml b/indra/newview/skins/default/xui/pl/floater_world_map.xml index 13ad1bccc7..95010e0b91 100644 --- a/indra/newview/skins/default/xui/pl/floater_world_map.xml +++ b/indra/newview/skins/default/xui/pl/floater_world_map.xml @@ -20,10 +20,10 @@ Sprzedaż Posiadłości </text> <text name="by_owner_label"> - przez właściciela + przez Właściciela </text> <text name="auction_label"> - aukcja posiadłości + aukcja Posiadłości </text> <button name="Go Home" tool_tip="Teleportuj do mojego Miejsca Startowego"/> <text name="Home_label"> diff --git a/indra/newview/skins/default/xui/pl/inspect_avatar.xml b/indra/newview/skins/default/xui/pl/inspect_avatar.xml index 6a688391c0..3ee0b976eb 100644 --- a/indra/newview/skins/default/xui/pl/inspect_avatar.xml +++ b/indra/newview/skins/default/xui/pl/inspect_avatar.xml @@ -15,7 +15,7 @@ <button label="IM" name="im_btn"/> <button label="Profil" name="view_profile_btn"/> <panel name="moderator_panel"> - <button label="Wyłącz Komunikację Głosową" name="disable_voice"/> - <button label="Włącz Komunikację Głosową" name="enable_voice"/> + <button label="Wyłącz komunikację głosową" name="disable_voice"/> + <button label="Włącz komunikację głosową" name="enable_voice"/> </panel> </floater> diff --git a/indra/newview/skins/default/xui/pl/inspect_group.xml b/indra/newview/skins/default/xui/pl/inspect_group.xml index d434443794..0a2a62ce74 100644 --- a/indra/newview/skins/default/xui/pl/inspect_group.xml +++ b/indra/newview/skins/default/xui/pl/inspect_group.xml @@ -5,10 +5,10 @@ --> <floater name="inspect_group"> <string name="PrivateGroup"> - Grupa Prywatna + Grupa prywatna </string> <string name="FreeToJoin"> - Wstęp Wolny + Wstęp wolny </string> <string name="CostToJoin"> L$[AMOUNT] by dołączyć diff --git a/indra/newview/skins/default/xui/pl/inspect_object.xml b/indra/newview/skins/default/xui/pl/inspect_object.xml index 822e28ea7e..2e15691463 100644 --- a/indra/newview/skins/default/xui/pl/inspect_object.xml +++ b/indra/newview/skins/default/xui/pl/inspect_object.xml @@ -21,13 +21,13 @@ właściciel [OWNER] Dotknij </string> <string name="Sit"> - Usiądź tu + Usiądź tutaj </string> <button label="Kup" name="buy_btn"/> <button label="Zapłać" name="pay_btn"/> <button label="Weź kopię" name="take_free_copy_btn"/> <button label="Dotknij" name="touch_btn"/> - <button label="Usiądź tu" name="sit_btn"/> + <button label="Usiądź tutaj" name="sit_btn"/> <button label="Otwórz" name="open_btn"/> <icon name="secure_browsing" tool_tip="Zabezpiecz przeglądanie"/> <button label="Więcej" name="more_info_btn"/> diff --git a/indra/newview/skins/default/xui/pl/menu_attachment_self.xml b/indra/newview/skins/default/xui/pl/menu_attachment_self.xml index 1107a5d9d1..ff695be205 100644 --- a/indra/newview/skins/default/xui/pl/menu_attachment_self.xml +++ b/indra/newview/skins/default/xui/pl/menu_attachment_self.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Attachment Pie"> - <menu_item_call label="Dotnij" name="Attachment Object Touch"/> + <menu_item_call label="Dotknij" name="Attachment Object Touch"/> <menu_item_call label="Edytuj" name="Edit..."/> <menu_item_call label="Odłącz" name="Detach"/> <menu_item_call label="Opuść" name="Drop"/> diff --git a/indra/newview/skins/default/xui/pl/menu_bottomtray.xml b/indra/newview/skins/default/xui/pl/menu_bottomtray.xml index 818dfc08ae..9fcf1b3440 100644 --- a/indra/newview/skins/default/xui/pl/menu_bottomtray.xml +++ b/indra/newview/skins/default/xui/pl/menu_bottomtray.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="hide_camera_move_controls_menu"> - <menu_item_check label="Przycisk Gesturek" name="ShowGestureButton"/> + <menu_item_check label="Przycisk Gestur" name="ShowGestureButton"/> <menu_item_check label="Przycisk Ruchu" name="ShowMoveButton"/> <menu_item_check label="Przycisk Widoku" name="ShowCameraButton"/> <menu_item_check label="Przycisk Zdjęć" name="ShowSnapshotButton"/> @@ -8,5 +8,5 @@ <menu_item_call label="Kopiuj" name="NearbyChatBar_Copy"/> <menu_item_call label="Wklej" name="NearbyChatBar_Paste"/> <menu_item_call label="Usuń" name="NearbyChatBar_Delete"/> - <menu_item_call label="Zaznacz Wszystko" name="NearbyChatBar_Select_All"/> + <menu_item_call label="Zaznacz wszystko" name="NearbyChatBar_Select_All"/> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_favorites.xml b/indra/newview/skins/default/xui/pl/menu_favorites.xml index 0a0b54a548..cbacaf4beb 100644 --- a/indra/newview/skins/default/xui/pl/menu_favorites.xml +++ b/indra/newview/skins/default/xui/pl/menu_favorites.xml @@ -3,7 +3,7 @@ <menu_item_call label="Teleportuj" name="Teleport To Landmark"/> <menu_item_call label="Zobacz/Edytuj Ulubione Miejsce" name="Landmark Open"/> <menu_item_call label="Kopiuj SLurl" name="Copy slurl"/> - <menu_item_call label="Pokaż na Mapie" name="Show On Map"/> + <menu_item_call label="Pokaż na mapie" name="Show On Map"/> <menu_item_call label="Kopiuj" name="Landmark Copy"/> <menu_item_call label="Wklej" name="Landmark Paste"/> <menu_item_call label="Usuń" name="Delete"/> diff --git a/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml b/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml index 1c2687338d..d30f5a4d3f 100644 --- a/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml +++ b/indra/newview/skins/default/xui/pl/menu_hide_navbar.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="hide_navbar_menu"> - <menu_item_check label="Pokaż Pasek Nawigacji" name="ShowNavbarNavigationPanel"/> - <menu_item_check label="Pokaż Pasek Ulubionych" name="ShowNavbarFavoritesPanel"/> + <menu_item_check label="Pokaż pasek Nawigacji" name="ShowNavbarNavigationPanel"/> + <menu_item_check label="Pokaż pasek Ulubionych" name="ShowNavbarFavoritesPanel"/> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_im_well_button.xml b/indra/newview/skins/default/xui/pl/menu_im_well_button.xml index 4962ffc356..207bc2211b 100644 --- a/indra/newview/skins/default/xui/pl/menu_im_well_button.xml +++ b/indra/newview/skins/default/xui/pl/menu_im_well_button.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="IM Well Button Context Menu"> - <menu_item_call label="Zamknij Wszystkie" name="Close All"/> + <menu_item_call label="Zamknij wszystkie" name="Close All"/> </context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml b/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml index 925272d5ee..4ead44878a 100644 --- a/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml +++ b/indra/newview/skins/default/xui/pl/menu_imchiclet_adhoc.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="IMChiclet AdHoc Menu"> - <menu_item_call label="Zakończ Rozmowę" name="End Session"/> + <menu_item_call label="Zakończ rozmowę" name="End Session"/> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml b/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml index dc232c096d..c53f72c043 100644 --- a/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml +++ b/indra/newview/skins/default/xui/pl/menu_imchiclet_group.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="IMChiclet Group Menu"> <menu_item_call label="O Grupie" name="Show Profile"/> - <menu_item_call label="Pokaż Sesję" name="Chat"/> - <menu_item_call label="Zakończ Rozmowę" name="End Session"/> + <menu_item_call label="Pokaż sesję" name="Chat"/> + <menu_item_call label="Zakończ rozmowę" name="End Session"/> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml b/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml index df991cbc36..c0c812c0a7 100644 --- a/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml +++ b/indra/newview/skins/default/xui/pl/menu_imchiclet_p2p.xml @@ -2,6 +2,6 @@ <menu name="IMChiclet P2P Menu"> <menu_item_call label="Zobacz Profil" name="Show Profile"/> <menu_item_call label="Dodaj Znajomość" name="Add Friend"/> - <menu_item_call label="Pokaż Sesję" name="Send IM"/> - <menu_item_call label="Zakończ Rozmowę" name="End Session"/> + <menu_item_call label="Pokaż sesję" name="Send IM"/> + <menu_item_call label="Zakończ rozmowę" name="End Session"/> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml b/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml index f6ac02f91c..325072d0fb 100644 --- a/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_inspect_avatar_gear.xml @@ -12,7 +12,7 @@ <menu_item_call label="Unieruchom" name="freeze"/> <menu_item_call label="Wyrzuć" name="eject"/> <menu_item_call label="Debug" name="debug"/> - <menu_item_call label="Znajdź na Mapie" name="find_on_map"/> + <menu_item_call label="Znajdź na mapie" name="find_on_map"/> <menu_item_call label="Przybliż" name="zoom_in"/> <menu_item_call label="Zapłać" name="pay"/> <menu_item_call label="Udostępnij" name="share"/> diff --git a/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml b/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml index 988c31a6e4..2c56d2ca3d 100644 --- a/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml +++ b/indra/newview/skins/default/xui/pl/menu_inspect_object_gear.xml @@ -5,7 +5,7 @@ <menu_item_call label="Zapłać" name="pay"/> <menu_item_call label="Kup" name="buy"/> <menu_item_call label="Weź" name="take"/> - <menu_item_call label="Weź Kopię" name="take_copy"/> + <menu_item_call label="Weź kopię" name="take_copy"/> <menu_item_call label="Otwórz" name="open"/> <menu_item_call label="Edytuj" name="edit"/> <menu_item_call label="Ubierz" name="wear"/> @@ -13,5 +13,5 @@ <menu_item_call label="Zablokuj" name="block"/> <menu_item_call label="Przybliż" name="zoom_in"/> <menu_item_call label="Usuń" name="remove"/> - <menu_item_call label="Więcej Informacji" name="more_info"/> + <menu_item_call label="Więcej informacji" name="more_info"/> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_inventory.xml b/indra/newview/skins/default/xui/pl/menu_inventory.xml index 30fb703584..7fe9da3c0c 100644 --- a/indra/newview/skins/default/xui/pl/menu_inventory.xml +++ b/indra/newview/skins/default/xui/pl/menu_inventory.xml @@ -4,32 +4,32 @@ <menu_item_call label="Otwórz" name="Task Open"/> <menu_item_call label="Odtwarzaj" name="Task Play"/> <menu_item_call label="Właściwości" name="Task Properties"/> - <menu_item_call label="Zmień Nazwę" name="Task Rename"/> + <menu_item_call label="Zmień nazwę" name="Task Rename"/> <menu_item_call label="Usuń" name="Task Remove"/> <menu_item_call label="Opróżnij Kosz" name="Empty Trash"/> <menu_item_call label="Opróżnij Folder Zgubione i Odnalezione" name="Empty Lost And Found"/> - <menu_item_call label="Nowy Folder" name="New Folder"/> - <menu_item_call label="Nowy Skrypt" name="New Script"/> - <menu_item_call label="Nowa Nota" name="New Note"/> - <menu_item_call label="Nowy Gest" name="New Gesture"/> + <menu_item_call label="Nowy folder" name="New Folder"/> + <menu_item_call label="Nowy skrypt" name="New Script"/> + <menu_item_call label="Nowa nota" name="New Note"/> + <menu_item_call label="Nowy gest" name="New Gesture"/> <menu label="Nowe Ubranie" name="New Clothes"> - <menu_item_call label="Nowa Koszulka" name="New Shirt"/> - <menu_item_call label="Nowe Spodnie" name="New Pants"/> - <menu_item_call label="Nowe Buty" name="New Shoes"/> - <menu_item_call label="Nowe Skarpety" name="New Socks"/> - <menu_item_call label="Nowa Kurtka" name="New Jacket"/> - <menu_item_call label="Nowa Spódnica" name="New Skirt"/> - <menu_item_call label="Nowe Rękawiczki" name="New Gloves"/> - <menu_item_call label="Nowy Podkoszulek" name="New Undershirt"/> - <menu_item_call label="Nowa Bielizna" name="New Underpants"/> - <menu_item_call label="Nowa Maska Przezroczysta" name="New Alpha Mask"/> - <menu_item_call label="Nowy Tatuaż" name="New Tattoo"/> + <menu_item_call label="Nowa koszulka" name="New Shirt"/> + <menu_item_call label="Nowe spodnie" name="New Pants"/> + <menu_item_call label="Nowe buty" name="New Shoes"/> + <menu_item_call label="Nowe skarpety" name="New Socks"/> + <menu_item_call label="Nowa kurtka" name="New Jacket"/> + <menu_item_call label="Nowa spódnica" name="New Skirt"/> + <menu_item_call label="Nowe rękawiczki" name="New Gloves"/> + <menu_item_call label="Nowy podkoszulek" name="New Undershirt"/> + <menu_item_call label="Nowa bielizna" name="New Underpants"/> + <menu_item_call label="Nowa maska Alpha" name="New Alpha Mask"/> + <menu_item_call label="Nowy tatuaż" name="New Tattoo"/> </menu> <menu label="Nowa Część Ciała" name="New Body Parts"> - <menu_item_call label="Nowy Kształt" name="New Shape"/> - <menu_item_call label="Nowa Skórka" name="New Skin"/> - <menu_item_call label="Nowe Włosy" name="New Hair"/> - <menu_item_call label="Nowe Oczy" name="New Eyes"/> + <menu_item_call label="Nowy kształt" name="New Shape"/> + <menu_item_call label="Nowa skórka" name="New Skin"/> + <menu_item_call label="Nowe włosy" name="New Hair"/> + <menu_item_call label="Nowe oczy" name="New Eyes"/> </menu> <menu label="Zmień Czcionkę" name="Change Type"> <menu_item_call label="Domyślna" name="Default"/> @@ -46,31 +46,31 @@ <menu_item_call label="Teleportuj" name="Landmark Open"/> <menu_item_call label="Otwórz" name="Animation Open"/> <menu_item_call label="Otwórz" name="Sound Open"/> - <menu_item_call label="Zmień Strój" name="Replace Outfit"/> - <menu_item_call label="Dodaj do Stroju" name="Add To Outfit"/> - <menu_item_call label="Usuń Obiekt" name="Purge Item"/> - <menu_item_call label="Przywróć Obiekt" name="Restore Item"/> + <menu_item_call label="Zmień strój" name="Replace Outfit"/> + <menu_item_call label="Dodaj do stroju" name="Add To Outfit"/> + <menu_item_call label="Usuń obiekt" name="Purge Item"/> + <menu_item_call label="Przywróć obiekt" name="Restore Item"/> <menu_item_call label="Otwórz" name="Open"/> <menu_item_call label="Właściwości" name="Properties"/> - <menu_item_call label="Zmień Nazwę" name="Rename"/> - <menu_item_call label="Kopiuj Dane UUID" name="Copy Asset UUID"/> + <menu_item_call label="Zmień nazwę" name="Rename"/> + <menu_item_call label="Kopiuj dane UUID" name="Copy Asset UUID"/> <menu_item_call label="Kopiuj" name="Copy"/> <menu_item_call label="Wklej" name="Paste"/> - <menu_item_call label="Wklej jako Link" name="Paste As Link"/> + <menu_item_call label="Wklej jako link" name="Paste As Link"/> <menu_item_call label="Usuń" name="Delete"/> <menu_item_call label="Skasuj Folder Systemu" name="Delete System Folder"/> - <menu_item_call label="Rozpocznij Konferencję Czatową" name="Conference Chat Folder"/> + <menu_item_call label="Rozpocznij konferencję czatową" name="Conference Chat Folder"/> <menu_item_call label="Odtwarzaj" name="Sound Play"/> <menu_item_call label="O Miejscu" name="About Landmark"/> - <menu_item_call label="Używaj w Świecie" name="Animation Play"/> - <menu_item_call label="Odtwarzaj Lokalnie" name="Animation Audition"/> + <menu_item_call label="Używaj in-world" name="Animation Play"/> + <menu_item_call label="Odtwarzaj lokalnie" name="Animation Audition"/> <menu_item_call label="Wyślij IM" name="Send Instant Message"/> - <menu_item_call label="Zaoferuj Teleportację..." name="Offer Teleport..."/> - <menu_item_call label="Rozpocznij Konferencję Czatową" name="Conference Chat"/> + <menu_item_call label="Teleportuj..." name="Offer Teleport..."/> + <menu_item_call label="Rozpocznij konferencję czatową" name="Conference Chat"/> <menu_item_call label="Aktywuj" name="Activate"/> <menu_item_call label="Deaktywuj" name="Deactivate"/> <menu_item_call label="Zapisz jako" name="Save As"/> - <menu_item_call label="Odłącz od Siebie" name="Detach From Yourself"/> + <menu_item_call label="Odłącz od siebie" name="Detach From Yourself"/> <menu_item_call label="Ubierz" name="Object Wear"/> <menu label="Dołącz do" name="Attach To"/> <menu label="Dołącz do Załączników HUD" name="Attach To HUD"/> diff --git a/indra/newview/skins/default/xui/pl/menu_inventory_add.xml b/indra/newview/skins/default/xui/pl/menu_inventory_add.xml index 5b8c5426dd..b4d85c2c5c 100644 --- a/indra/newview/skins/default/xui/pl/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/pl/menu_inventory_add.xml @@ -1,32 +1,32 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="menu_inventory_add"> <menu label="Załaduj" name="upload"> - <menu_item_call label="Obraz (L$[COST])..." name="Upload Image"/> - <menu_item_call label="Dźwięk (L$[COST])..." name="Upload Sound"/> - <menu_item_call label="Animację (L$[COST])..." name="Upload Animation"/> - <menu_item_call label="Zbiór Plików (L$[COST] za jeden plik)..." name="Bulk Upload"/> + <menu_item_call label="obraz (L$[COST])..." name="Upload Image"/> + <menu_item_call label="dźwięk (L$[COST])..." name="Upload Sound"/> + <menu_item_call label="animację (L$[COST])..." name="Upload Animation"/> + <menu_item_call label="zbiór plików (L$[COST] za jeden plik)..." name="Bulk Upload"/> </menu> - <menu_item_call label="Nowy Folder" name="New Folder"/> - <menu_item_call label="Nowy Skrypt" name="New Script"/> - <menu_item_call label="Nowa Nota" name="New Note"/> - <menu_item_call label="Nowa Gesturka" name="New Gesture"/> + <menu_item_call label="Nowy folder" name="New Folder"/> + <menu_item_call label="Nowy skrypt" name="New Script"/> + <menu_item_call label="Nowa nota" name="New Note"/> + <menu_item_call label="Nowy gest" name="New Gesture"/> <menu label="Nowe Ubranie" name="New Clothes"> - <menu_item_call label="Nowa Koszulka" name="New Shirt"/> - <menu_item_call label="Nowe Spodnie" name="New Pants"/> - <menu_item_call label="Nowe Buty" name="New Shoes"/> - <menu_item_call label="Nowe Skarpetki" name="New Socks"/> - <menu_item_call label="Nowa Kurtka" name="New Jacket"/> - <menu_item_call label="Nowa Spódnica" name="New Skirt"/> - <menu_item_call label="Nowe Rękawiczki" name="New Gloves"/> - <menu_item_call label="Nowy Podkoszulek" name="New Undershirt"/> - <menu_item_call label="Nowa Bielizna" name="New Underpants"/> - <menu_item_call label="Nowe Ubranie Przezroczyste" name="New Alpha"/> - <menu_item_call label="Nowy Tatuaż" name="New Tattoo"/> + <menu_item_call label="Nowa koszulka" name="New Shirt"/> + <menu_item_call label="Nowe spodnie" name="New Pants"/> + <menu_item_call label="Nowe buty" name="New Shoes"/> + <menu_item_call label="Nowe skarpetki" name="New Socks"/> + <menu_item_call label="Nowa kurtka" name="New Jacket"/> + <menu_item_call label="Nowa spódnica" name="New Skirt"/> + <menu_item_call label="Nowe rękawiczki" name="New Gloves"/> + <menu_item_call label="Nowy podkoszulek" name="New Undershirt"/> + <menu_item_call label="Nowa bielizna" name="New Underpants"/> + <menu_item_call label="Nowe ubranie Przezroczyste" name="New Alpha"/> + <menu_item_call label="Nowy tatuaż" name="New Tattoo"/> </menu> <menu label="Nowa Część Ciała" name="New Body Parts"> - <menu_item_call label="Nowy Kształt" name="New Shape"/> - <menu_item_call label="Nowa Skórka" name="New Skin"/> - <menu_item_call label="Nowe Włosy" name="New Hair"/> - <menu_item_call label="Nowe Oczy" name="New Eyes"/> + <menu_item_call label="Nowy kształt" name="New Shape"/> + <menu_item_call label="Nowa skórka" name="New Skin"/> + <menu_item_call label="Nowe włosy" name="New Hair"/> + <menu_item_call label="Nowe oczy" name="New Eyes"/> </menu> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml b/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml index 8f5f94a02f..2ec3741682 100644 --- a/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/pl/menu_inventory_gear_default.xml @@ -1,14 +1,14 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="menu_gear_default"> - <menu_item_call label="Nowe Okno Szafy" name="new_window"/> - <menu_item_call label="Porządkuj Według Nazwy" name="sort_by_name"/> - <menu_item_call label="Porządkuj Według Daty" name="sort_by_recent"/> - <menu_item_call label="Pokaż Filtry" name="show_filters"/> - <menu_item_call label="Zresetuj Filtry" name="reset_filters"/> - <menu_item_call label="Zamknij Wszystkie Foldery" name="close_folders"/> + <menu_item_call label="Nowe okno Szafy" name="new_window"/> + <menu_item_call label="Porządkuj według nazwy" name="sort_by_name"/> + <menu_item_call label="Porządkuj według daty" name="sort_by_recent"/> + <menu_item_call label="Pokaż filtry" name="show_filters"/> + <menu_item_call label="Zresetuj filtry" name="reset_filters"/> + <menu_item_call label="Zamknij wszystkie foldery" name="close_folders"/> <menu_item_call label="Opróżnij Kosz" name="empty_trash"/> <menu_item_call label="Opróżnij Zagubione i Odnalezione" name="empty_lostnfound"/> - <menu_item_call label="Zapisz Teksturę Jako" name="Save Texture As"/> - <menu_item_call label="Znajdź Oryginał" name="Find Original"/> - <menu_item_call label="Znajdź Wszystkie Linki" name="Find All Links"/> + <menu_item_call label="Zapisz teksturę jako" name="Save Texture As"/> + <menu_item_call label="Znajdź oryginał" name="Find Original"/> + <menu_item_call label="Znajdź wszystkie linki" name="Find All Links"/> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_land.xml b/indra/newview/skins/default/xui/pl/menu_land.xml index 2c89b43525..1e1ce73089 100644 --- a/indra/newview/skins/default/xui/pl/menu_land.xml +++ b/indra/newview/skins/default/xui/pl/menu_land.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Land Pie"> <menu_item_call label="O Posiadłości" name="Place Information..."/> - <menu_item_call label="Usiądź Tutaj" name="Sit Here"/> + <menu_item_call label="Usiądź tutaj" name="Sit Here"/> <menu_item_call label="Kup Posiadłość" name="Land Buy"/> - <menu_item_call label="Kup Wstęp" name="Land Buy Pass"/> + <menu_item_call label="Kup przepustkę" name="Land Buy Pass"/> <menu_item_call label="Buduj" name="Create"/> - <menu_item_call label="Edytuj Teren" name="Edit Terrain"/> + <menu_item_call label="Edytuj teren" name="Edit Terrain"/> </context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_landmark.xml b/indra/newview/skins/default/xui/pl/menu_landmark.xml index 8cd7e03bf1..aa5808390c 100644 --- a/indra/newview/skins/default/xui/pl/menu_landmark.xml +++ b/indra/newview/skins/default/xui/pl/menu_landmark.xml @@ -3,5 +3,5 @@ <menu_item_call label="Kopiuj SLurl" name="copy"/> <menu_item_call label="Usuń" name="delete"/> <menu_item_call label="Utwórz" name="pick"/> - <menu_item_call label="Dodaj do Paska Ulubionych" name="add_to_favbar"/> + <menu_item_call label="Dodaj do paska Ulubionych" name="add_to_favbar"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_login.xml b/indra/newview/skins/default/xui/pl/menu_login.xml index be7c8c2102..2673f5c271 100644 --- a/indra/newview/skins/default/xui/pl/menu_login.xml +++ b/indra/newview/skins/default/xui/pl/menu_login.xml @@ -2,7 +2,7 @@ <menu_bar name="Login Menu"> <menu label="Ja" name="File"> <menu_item_call label="Ustawienia" name="Preferences..."/> - <menu_item_call label="Wyłącz Program" name="Quit"/> + <menu_item_call label="Wyłącz program" name="Quit"/> </menu> <menu label="Pomoc" name="Help"> <menu_item_call label="[SECOND_LIFE]: Pomoc" name="Second Life Help"/> @@ -16,15 +16,15 @@ <menu_item_call label="Wklej" name="Paste"/> <menu_item_call label="Usuń" name="Delete"/> <menu_item_call label="Powiel" name="Duplicate"/> - <menu_item_call label="Zaznacz Wszystko" name="Select All"/> + <menu_item_call label="Zaznacz wszystko" name="Select All"/> <menu_item_call label="Odznacz" name="Deselect"/> </menu> - <menu_item_call label="Ustawienia Debugowania" name="Debug Settings"/> - <menu_item_call label="Ustawienia UI/Kolor" name="UI/Color Settings"/> + <menu_item_call label="Ustawienia debugowania" name="Debug Settings"/> + <menu_item_call label="Ustawienia UI/kolor" name="UI/Color Settings"/> <menu label="UI Testy" name="UI Tests"/> - <menu_item_call label="Ustaw Rozmiar Interfejsu..." name="Set Window Size..."/> + <menu_item_call label="Ustaw rozmiar interfejsu..." name="Set Window Size..."/> <menu_item_call label="Wyświetl TOS" name="TOS"/> - <menu_item_call label="Wyświetl Wiadomość Krytyczną" name="Critical"/> - <menu_item_call label="Test Przeglądarki Internetowej" name="Web Browser Test"/> + <menu_item_call label="Wyświetl wiadomość krytyczną" name="Critical"/> + <menu_item_call label="Test przeglądarki internetowej" name="Web Browser Test"/> </menu> </menu_bar> diff --git a/indra/newview/skins/default/xui/pl/menu_mini_map.xml b/indra/newview/skins/default/xui/pl/menu_mini_map.xml index dbebeadfbe..94e4c91abb 100644 --- a/indra/newview/skins/default/xui/pl/menu_mini_map.xml +++ b/indra/newview/skins/default/xui/pl/menu_mini_map.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="Popup"> - <menu_item_call label="Zoom Blisko" name="Zoom Close"/> - <menu_item_call label="Zoom Średnio" name="Zoom Medium"/> - <menu_item_call label="Zoom Daleko" name="Zoom Far"/> - <menu_item_check label="Obróć Mapę" name="Rotate Map"/> + <menu_item_call label="Zoom blisko" name="Zoom Close"/> + <menu_item_call label="Zoom średnio" name="Zoom Medium"/> + <menu_item_call label="Zoom daleko" name="Zoom Far"/> + <menu_item_check label="Obróć mapę" name="Rotate Map"/> <menu_item_call label="Zatrzymaj" name="Stop Tracking"/> <menu_item_call label="Mapa Świata" name="World Map"/> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_navbar.xml b/indra/newview/skins/default/xui/pl/menu_navbar.xml index 8d84f3e764..f38b805ee2 100644 --- a/indra/newview/skins/default/xui/pl/menu_navbar.xml +++ b/indra/newview/skins/default/xui/pl/menu_navbar.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="Navbar Menu"> - <menu_item_check label="Pokaż Współrzędne" name="Show Coordinates"/> - <menu_item_check label="Pokaż Właściwości Posiadłości" name="Show Parcel Properties"/> + <menu_item_check label="Pokaż współrzędne" name="Show Coordinates"/> + <menu_item_check label="Pokaż właściwości Posiadłości" name="Show Parcel Properties"/> <menu_item_call label="Ulubione Miejsce" name="Landmark"/> <menu_item_call label="Wytnij" name="Cut"/> <menu_item_call label="Kopiuj" name="Copy"/> <menu_item_call label="Wklej" name="Paste"/> <menu_item_call label="Usuń" name="Delete"/> - <menu_item_call label="Zaznacz Wszystko" name="Select All"/> + <menu_item_call label="Zaznacz wszystko" name="Select All"/> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml b/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml index 78b8c0a4fc..fe5bc6ba6f 100644 --- a/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml +++ b/indra/newview/skins/default/xui/pl/menu_nearby_chat.xml @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="NearBy Chat Menu"> - <menu_item_call label="Pokaż Osoby w Pobliżu..." name="nearby_people"/> - <menu_item_check label="Pokaż Zablokowany Tekst" name="muted_text"/> - <menu_item_check label="Wyświetlaj Ikonki Znajomych" name="show_buddy_icons"/> - <menu_item_check label="Wyświetlaj Imiona" name="show_names"/> - <menu_item_check label="Wyświetlaj Ikonki i Imiona" name="show_icons_and_names"/> - <menu_item_call label="Rozmiar Czcionki" name="font_size"/> + <menu_item_call label="Pokaż osoby w pobliżu..." name="nearby_people"/> + <menu_item_check label="Pokaż zablokowany tekst" name="muted_text"/> + <menu_item_check label="Wyświetlaj ikonki znajomych" name="show_buddy_icons"/> + <menu_item_check label="Wyświetlaj imiona" name="show_names"/> + <menu_item_check label="Wyświetlaj ikonki i imiona" name="show_icons_and_names"/> + <menu_item_call label="Rozmiar czcionki" name="font_size"/> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_object.xml b/indra/newview/skins/default/xui/pl/menu_object.xml index d71611ce91..763b120f89 100644 --- a/indra/newview/skins/default/xui/pl/menu_object.xml +++ b/indra/newview/skins/default/xui/pl/menu_object.xml @@ -4,7 +4,7 @@ <menu_item_call label="Edytuj" name="Edit..."/> <menu_item_call label="Buduj" name="Build"/> <menu_item_call label="Otwórz" name="Open"/> - <menu_item_call label="Usiądź Tutaj" name="Object Sit"/> + <menu_item_call label="Usiądź tutaj" name="Object Sit"/> <menu_item_call label="Wstań" name="Object Stand Up"/> <menu_item_call label="Sprawdź" name="Object Inspect"/> <menu_item_call label="Przybliż" name="Zoom In"/> @@ -21,7 +21,7 @@ </context_menu> <menu_item_call label="Kup" name="Pie Object Bye"/> <menu_item_call label="Weź" name="Pie Object Take"/> - <menu_item_call label="Weź Kopię" name="Take Copy"/> + <menu_item_call label="Weź kopię" name="Take Copy"/> <menu_item_call label="Zapłać" name="Pay..."/> <menu_item_call label="Kup" name="Buy..."/> </context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_participant_list.xml b/indra/newview/skins/default/xui/pl/menu_participant_list.xml index 9b60b17ba8..079b8558da 100644 --- a/indra/newview/skins/default/xui/pl/menu_participant_list.xml +++ b/indra/newview/skins/default/xui/pl/menu_participant_list.xml @@ -8,8 +8,8 @@ <menu_item_call label="Zadzwoń" name="Call"/> <menu_item_call label="Udostępnij" name="Share"/> <menu_item_call label="Zapłać" name="Pay"/> - <menu_item_check label="Zablokuj Głos" name="Block/Unblock"/> - <menu_item_check label="Zablokuj Tekst" name="MuteText"/> + <menu_item_check label="Zablokuj głos" name="Block/Unblock"/> + <menu_item_check label="Zablokuj tekst" name="MuteText"/> <context_menu label="Opcje Moderatora >" name="Moderator Options"> <menu_item_check label="Czat/IM dozwolony" name="AllowTextChat"/> <menu_item_call label="Wycisz tego uczestnika" name="ModerateVoiceMuteSelected"/> diff --git a/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml index 0043030035..9c33fad00f 100644 --- a/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_friends_view_sort.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="menu_group_plus"> - <menu_item_check label="Porządkuj Według Nazwy" name="sort_name"/> - <menu_item_check label="Porządkuj Według Statusu" name="sort_status"/> - <menu_item_check label="Wyświetlaj Ikonki" name="view_icons"/> - <menu_item_call label="Pokaż Zablokowanych Rezydentów & Obiekty" name="show_blocked_list"/> + <menu_item_check label="Porządkuj według nazwy" name="sort_name"/> + <menu_item_check label="Porządkuj według statusu" name="sort_status"/> + <menu_item_check label="Wyświetlaj ikonki" name="view_icons"/> + <menu_item_call label="Pokaż zablokowanych Rezydentów & obiekty" name="show_blocked_list"/> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml index f661cfeba0..4be60d9b83 100644 --- a/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_groups_view_sort.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="menu_group_plus"> - <menu_item_check label="Wyświetlaj Ikonki Grupy" name="Display Group Icons"/> - <menu_item_call label="Opuść Zaznaczone Grupy" name="Leave Selected Group"/> + <menu_item_check label="Wyświetlaj ikonki Grupy" name="Display Group Icons"/> + <menu_item_call label="Opuść zaznaczone Grupy" name="Leave Selected Group"/> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_people_nearby.xml b/indra/newview/skins/default/xui/pl/menu_people_nearby.xml index fcba806e45..afe3a5200b 100644 --- a/indra/newview/skins/default/xui/pl/menu_people_nearby.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_nearby.xml @@ -2,7 +2,7 @@ <context_menu name="Avatar Context Menu"> <menu_item_call label="Zobacz Profil" name="View Profile"/> <menu_item_call label="Dodaj Znajomość" name="Add Friend"/> - <menu_item_call label="Usuń z listy znajomych" name="Remove Friend"/> + <menu_item_call label="Usuń z listy Znajomych" name="Remove Friend"/> <menu_item_call label="IM" name="IM"/> <menu_item_call label="Zadzwoń" name="Call"/> <menu_item_call label="Mapa" name="Map"/> diff --git a/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml index 9e5f1a5917..8ec3820f84 100644 --- a/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_nearby_view_sort.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="menu_group_plus"> - <menu_item_check label="Porządkuj Według Ostatnich Rozmówców" name="sort_by_recent_speakers"/> - <menu_item_check label="Porządkuj Według Nazwy" name="sort_name"/> - <menu_item_check label="Porządkuj Według Odległości" name="sort_distance"/> - <menu_item_check label="Wyświetlaj Ikonki" name="view_icons"/> - <menu_item_call label="Pokaż Zablokowanych Rezydentów & Obiekty" name="show_blocked_list"/> + <menu_item_check label="Porządkuj według ostatnich rozmówców" name="sort_by_recent_speakers"/> + <menu_item_check label="Porządkuj według nazwy" name="sort_name"/> + <menu_item_check label="Porządkuj według odległości" name="sort_distance"/> + <menu_item_check label="Wyświetlaj ikonki" name="view_icons"/> + <menu_item_call label="Pokaż zablokowanych Rezydentów & obiekty" name="show_blocked_list"/> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml b/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml index 418b67bce8..b474a556bd 100644 --- a/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml +++ b/indra/newview/skins/default/xui/pl/menu_people_recent_view_sort.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="menu_group_plus"> - <menu_item_check label="Porządkuj Według Daty" name="sort_most"/> - <menu_item_check label="Porządkuj Według Nazwy" name="sort_name"/> - <menu_item_check label="Wyświetlaj Ikonki" name="view_icons"/> - <menu_item_call label="Pokaż Zablokowanych Rezydentów & Obiekty" name="show_blocked_list"/> + <menu_item_check label="Porządkuj według daty" name="sort_most"/> + <menu_item_check label="Porządkuj według nazwy" name="sort_name"/> + <menu_item_check label="Wyświetlaj ikonki" name="view_icons"/> + <menu_item_call label="Pokaż zablokowanych Rezydentów & obiekty" name="show_blocked_list"/> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_picks_plus.xml b/indra/newview/skins/default/xui/pl/menu_picks_plus.xml index 14ab9c2978..8f196612a8 100644 --- a/indra/newview/skins/default/xui/pl/menu_picks_plus.xml +++ b/indra/newview/skins/default/xui/pl/menu_picks_plus.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <toggleable_menu name="picks_plus_menu"> - <menu_item_call label="Utwórz" name="create_pick"/> + <menu_item_call label="Stwórz" name="create_pick"/> <menu_item_call label="Nowa Reklama" name="create_classified"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_place.xml b/indra/newview/skins/default/xui/pl/menu_place.xml index 72f4b1265f..312bfc6bb0 100644 --- a/indra/newview/skins/default/xui/pl/menu_place.xml +++ b/indra/newview/skins/default/xui/pl/menu_place.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <toggleable_menu name="place_overflow_menu"> - <menu_item_call label="Zapisz Ulubione Miejsce" name="landmark"/> + <menu_item_call label="Zapisz Landmark" name="landmark"/> <menu_item_call label="Utwórz" name="pick"/> - <menu_item_call label="Kup Wstęp" name="pass"/> + <menu_item_call label="Kup Przepustkę" name="pass"/> <menu_item_call label="Edytuj" name="edit"/> </toggleable_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_place_add_button.xml b/indra/newview/skins/default/xui/pl/menu_place_add_button.xml index a737fc49ce..6175671fb9 100644 --- a/indra/newview/skins/default/xui/pl/menu_place_add_button.xml +++ b/indra/newview/skins/default/xui/pl/menu_place_add_button.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="menu_folder_gear"> - <menu_item_call label="Dodaj Folder" name="add_folder"/> - <menu_item_call label="Dodaj do Ulubionych Miejsc" name="add_landmark"/> + <menu_item_call label="Dodaj folder" name="add_folder"/> + <menu_item_call label="Dodaj do Landmarków" name="add_landmark"/> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml b/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml index f5ece87b28..d17b6c1033 100644 --- a/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml +++ b/indra/newview/skins/default/xui/pl/menu_places_gear_folder.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="menu_folder_gear"> - <menu_item_call label="Dodaj do Ulubionych Miejsc" name="add_landmark"/> - <menu_item_call label="Dodaj Folder" name="add_folder"/> + <menu_item_call label="Dodaj do Landmarków" name="add_landmark"/> + <menu_item_call label="Dodaj folder" name="add_folder"/> <menu_item_call label="Wytnij" name="cut"/> <menu_item_call label="Kopiuj" name="copy_folder"/> <menu_item_call label="Wklej" name="paste"/> - <menu_item_call label="Zmień Nazwę" name="rename"/> + <menu_item_call label="Zmień nazwę" name="rename"/> <menu_item_call label="Usuń" name="delete"/> <menu_item_call label="Rozwiń" name="expand"/> <menu_item_call label="Schowaj" name="collapse"/> - <menu_item_call label="Rozwiń Wszystkie Foldery" name="expand_all"/> - <menu_item_call label="Schowaj Wszystkie Foldery" name="collapse_all"/> + <menu_item_call label="Rozwiń wszystkie foldery" name="expand_all"/> + <menu_item_call label="Schowaj wszystkie foldery" name="collapse_all"/> <menu_item_check label="Sortuj według daty" name="sort_by_date"/> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml b/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml index e88f650ed0..0720aea8aa 100644 --- a/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml +++ b/indra/newview/skins/default/xui/pl/menu_places_gear_landmark.xml @@ -1,18 +1,18 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="menu_ladmark_gear"> <menu_item_call label="Teleportuj" name="teleport"/> - <menu_item_call label="Więcej Informacji" name="more_info"/> - <menu_item_call label="Pokaż na Mapie" name="show_on_map"/> - <menu_item_call label="Dodaj do Ulubionych Miejsc" name="add_landmark"/> - <menu_item_call label="Dodaj Folder" name="add_folder"/> + <menu_item_call label="Więcej informacji" name="more_info"/> + <menu_item_call label="Pokaż na mapie" name="show_on_map"/> + <menu_item_call label="Dodaj do Landmarków" name="add_landmark"/> + <menu_item_call label="Dodaj folder" name="add_folder"/> <menu_item_call label="Wytnij" name="cut"/> - <menu_item_call label="Kopiuj Ulubione Miejsce" name="copy_landmark"/> + <menu_item_call label="Kopiuj Landmark" name="copy_landmark"/> <menu_item_call label="Kopiuj SLurl" name="copy_slurl"/> <menu_item_call label="Wklej" name="paste"/> - <menu_item_call label="Zmień Nazwę" name="rename"/> + <menu_item_call label="Zmień nazwę" name="rename"/> <menu_item_call label="Usuń" name="delete"/> - <menu_item_call label="Rozwiń Wszystkie Foldery" name="expand_all"/> - <menu_item_call label="Schowaj Wszystkie Foldery" name="collapse_all"/> + <menu_item_call label="Rozwiń wszystkie foldery" name="expand_all"/> + <menu_item_call label="Schowaj wszystkie foldery" name="collapse_all"/> <menu_item_check label="Sortuj według daty" name="sort_by_date"/> <menu_item_call label="Stwórz Ulubione" name="create_pick"/> </menu> diff --git a/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml index 7e58747267..cd36c116b0 100644 --- a/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/pl/menu_teleport_history_item.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Teleport History Item Context Menu"> <menu_item_call label="Teleportuj" name="Teleport"/> - <menu_item_call label="Więcej Szczegółów" name="More Information"/> + <menu_item_call label="Więcej szczegółów" name="More Information"/> <menu_item_call label="Kopiuj do schowka" name="CopyToClipboard"/> </context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_url_agent.xml b/indra/newview/skins/default/xui/pl/menu_url_agent.xml index 0f210b140b..7c90e6582d 100644 --- a/indra/newview/skins/default/xui/pl/menu_url_agent.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_agent.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> <menu_item_call label="Pokaż Profil Rezydenta" name="show_agent"/> - <menu_item_call label="Kopiuj Nazwę do Schowka" name="url_copy_label"/> + <menu_item_call label="Kopiuj nazwę do schowka" name="url_copy_label"/> <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_url_group.xml b/indra/newview/skins/default/xui/pl/menu_url_group.xml index 38e4360691..109f96e562 100644 --- a/indra/newview/skins/default/xui/pl/menu_url_group.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_group.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Pokaż Szczegóły o Grupie" name="show_group"/> - <menu_item_call label="Kopiuj Grupę do Schowka" name="url_copy_label"/> + <menu_item_call label="Pokaż szczegóły o Grupie" name="show_group"/> + <menu_item_call label="Kopiuj Grupę do schowka" name="url_copy_label"/> <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_url_http.xml b/indra/newview/skins/default/xui/pl/menu_url_http.xml index 0d8793d41e..e73f7b6745 100644 --- a/indra/newview/skins/default/xui/pl/menu_url_http.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_http.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Otwórz Przeglądarkę Internetową" name="url_open"/> - <menu_item_call label="Otwórz w Wewnętrzenej Przeglądarce" name="url_open_internal"/> - <menu_item_call label="Otwórz w Zewnętrznej Przeglądarce" name="url_open_external"/> + <menu_item_call label="Otwórz przeglądarkę internetową" name="url_open"/> + <menu_item_call label="Otwórz w wewnętrzenej przeglądarce" name="url_open_internal"/> + <menu_item_call label="Otwórz w zewnętrznej przeglądarce" name="url_open_external"/> <menu_item_call label="Kopiuj URL do schowka" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_url_inventory.xml b/indra/newview/skins/default/xui/pl/menu_url_inventory.xml index c11860d6fe..ce3309cba0 100644 --- a/indra/newview/skins/default/xui/pl/menu_url_inventory.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_inventory.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Pokaż Obiekt w Szafie" name="show_item"/> - <menu_item_call label="Kopiuj Nazwę do Schowka" name="url_copy_label"/> + <menu_item_call label="Pokaż obiekt w Szafie" name="show_item"/> + <menu_item_call label="Kopiuj nazwę do schowka" name="url_copy_label"/> <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_url_map.xml b/indra/newview/skins/default/xui/pl/menu_url_map.xml index becbd8276f..179ab1f676 100644 --- a/indra/newview/skins/default/xui/pl/menu_url_map.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_map.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Pokaż na Mapie" name="show_on_map"/> - <menu_item_call label="Teleportuj do Miejsca" name="teleport_to_location"/> + <menu_item_call label="Pokaż na mapie" name="show_on_map"/> + <menu_item_call label="Teleportuj do miejsca" name="teleport_to_location"/> <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_url_objectim.xml b/indra/newview/skins/default/xui/pl/menu_url_objectim.xml index 0bdf1da2a4..7576208a9e 100644 --- a/indra/newview/skins/default/xui/pl/menu_url_objectim.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_objectim.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Pokaż Szczegóły o Obiekcie" name="show_object"/> - <menu_item_call label="Pokaż na Mapie" name="show_on_map"/> - <menu_item_call label="Teleportuj to Miejsca Obiektu" name="teleport_to_object"/> - <menu_item_call label="Kopiuj Nazwę Obiektu do Schowka" name="url_copy_label"/> + <menu_item_call label="Pokaż szczegóły o obiekcie" name="show_object"/> + <menu_item_call label="Pokaż na mapie" name="show_on_map"/> + <menu_item_call label="Teleportuj to miejsca obiektu" name="teleport_to_object"/> + <menu_item_call label="Kopiuj nazwę obiektu do schowka" name="url_copy_label"/> <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_url_parcel.xml b/indra/newview/skins/default/xui/pl/menu_url_parcel.xml index 881c010bc1..43b945b8be 100644 --- a/indra/newview/skins/default/xui/pl/menu_url_parcel.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_parcel.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Pokaż Szczegóły o Miejscu" name="show_parcel"/> - <menu_item_call label="Pokaż na Mapie" name="show_on_map"/> + <menu_item_call label="Pokaż szczegóły o Miejscu" name="show_parcel"/> + <menu_item_call label="Pokaż na mapie" name="show_on_map"/> <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_url_slurl.xml b/indra/newview/skins/default/xui/pl/menu_url_slurl.xml index b9fa692365..456146d8e5 100644 --- a/indra/newview/skins/default/xui/pl/menu_url_slurl.xml +++ b/indra/newview/skins/default/xui/pl/menu_url_slurl.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <context_menu name="Url Popup"> - <menu_item_call label="Pokaż Szczegóły o Miejscu" name="show_place"/> - <menu_item_call label="Pokaż na Mapie" name="show_on_map"/> + <menu_item_call label="Pokaż szczegóły o Miejscu" name="show_place"/> + <menu_item_call label="Pokaż na mapie" name="show_on_map"/> <menu_item_call label="Teleportuj do miejsca" name="teleport_to_location"/> <menu_item_call label="Kopiuj SLurl do schowka" name="url_copy"/> </context_menu> diff --git a/indra/newview/skins/default/xui/pl/menu_viewer.xml b/indra/newview/skins/default/xui/pl/menu_viewer.xml index 23a17f4eda..85ceb9592f 100644 --- a/indra/newview/skins/default/xui/pl/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pl/menu_viewer.xml @@ -8,7 +8,7 @@ <menu_item_call label="Mój Wygląd" name="Appearance"/> <menu_item_check label="Moja Szafa" name="Inventory"/> <menu_item_check label="Moja Szafa" name="ShowSidetrayInventory"/> - <menu_item_check label="Moje Gesturki" name="Gestures"/> + <menu_item_check label="Moje Gesty" name="Gestures"/> <menu label="Mój Status" name="Status"> <menu_item_call label="Tryb Oddalenia" name="Set Away"/> <menu_item_call label="Tryb Pracy" name="Set Busy"/> @@ -75,7 +75,7 @@ <menu_item_call label="Zaznacz Wszystko" name="Select All"/> <menu_item_call label="Cofnij Zaznaczenie" name="Deselect"/> </menu> - <menu_item_call label="Grupuj" name="Link"/> + <menu_item_call label="Linkuj" name="Link"/> <menu_item_call label="Rozlinkuj" name="Unlink"/> <menu_item_check label="Edytuj Zgrupowane Obiekty" name="Edit Linked Parts"/> <menu_item_call label="Ogniskowa Selekcji" name="Focus on Selection"/> diff --git a/indra/newview/skins/default/xui/pl/mime_types.xml b/indra/newview/skins/default/xui/pl/mime_types.xml index c90d5761e6..cbf2afa91d 100644 --- a/indra/newview/skins/default/xui/pl/mime_types.xml +++ b/indra/newview/skins/default/xui/pl/mime_types.xml @@ -2,13 +2,13 @@ <mimetypes name="default"> <widgetset name="web"> <label name="web_label"> - Zawartość Strony Internetowej + Zawartość przeglądarki internetowej </label> <tooltip name="web_tooltip"> - To miejsce posiada zawartość strony internetowej + To miejsce posiada zawartość przeglądarki internetowej </tooltip> <playtip name="web_playtip"> - Pokaż zawartość strony internetowej + Pokaż zawartość przeglądarki internetowej </playtip> </widgetset> <widgetset name="movie"> diff --git a/indra/newview/skins/default/xui/pl/mime_types_linux.xml b/indra/newview/skins/default/xui/pl/mime_types_linux.xml index 0c901809dc..a2b8168b51 100644 --- a/indra/newview/skins/default/xui/pl/mime_types_linux.xml +++ b/indra/newview/skins/default/xui/pl/mime_types_linux.xml @@ -2,13 +2,13 @@ <mimetypes name="default"> <widgetset name="web"> <label name="web_label"> - Zawartość Strony Internetowej + Zawartość przeglądarki internetowej </label> <tooltip name="web_tooltip"> - W tym miejscu można zobaczyć zawartość strony internetowej + W tym miejscu można zobaczyć zawartość przeglądarki internetowej </tooltip> <playtip name="web_playtip"> - Pokaż zawartość strony internetowej + Pokaż zawartość przeglądarki internetowej </playtip> </widgetset> <widgetset name="movie"> diff --git a/indra/newview/skins/default/xui/pl/mime_types_mac.xml b/indra/newview/skins/default/xui/pl/mime_types_mac.xml index bd39ff7ac3..ae860249bb 100644 --- a/indra/newview/skins/default/xui/pl/mime_types_mac.xml +++ b/indra/newview/skins/default/xui/pl/mime_types_mac.xml @@ -2,13 +2,13 @@ <mimetypes name="default"> <widgetset name="web"> <label name="web_label"> - Zawartość Przeglądarki Internetowej + Zawartość przeglądarki internetowej </label> <tooltip name="web_tooltip"> - To miejsce posiada zawartość internetową + W tym miejscu można zobaczyć zawartość przeglądarki internetowej </tooltip> <playtip name="web_playtip"> - Pokaż Zawartość Przeglądarki Internetowej + Pokaż zawartość przeglądarki internetowej </playtip> </widgetset> <widgetset name="movie"> diff --git a/indra/newview/skins/default/xui/pl/notifications.xml b/indra/newview/skins/default/xui/pl/notifications.xml index f565a0fa18..12d68ed30e 100644 --- a/indra/newview/skins/default/xui/pl/notifications.xml +++ b/indra/newview/skins/default/xui/pl/notifications.xml @@ -89,7 +89,7 @@ Sprawdź stan swojego połączenia sieciowego. W trakcie ładwania tekstu dla skryptu pojawił się problem z następującego powodu: [REASON]. Spróbuj ponownie za kilka minut. </notification> <notification name="CompileQueueSaveBytecode"> - W trakcie ładwania skompilowanego skryptu pojawił się problem z następującego powodu: [REASON]. Spróbuj ponownie za kilka minut. + W trakcie ładowania skompilowanego skryptu pojawił się problem z następującego powodu: [REASON]. Spróbuj ponownie za kilka minut. </notification> <notification name="WriteAnimationFail"> Problem w zapisywaniu danych animacji. Spróbuj ponownie za kilka minut. @@ -255,7 +255,7 @@ Obiekty: [N] <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/> </notification> <notification name="DisableAllTopObjects"> - Czy na pewno chcesz deaktywować wszystkie obiekty w tym regionie? + Czy na pewno chcesz deaktywować wszystkie obiekty w tym Regionie? <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/> </notification> <notification name="ReturnObjectsNotOwnedByGroup"> @@ -325,7 +325,7 @@ Czy chcesz przejść na stronę www.secondlife.com by założyć konto? <notification name="AddClassified"> Ogłoszenia reklamowe ukazują się w zakładce Reklama w wyszukiwarce (Szukaj) oraz na [http://secondlife.com/community/classifieds secondlife.com] przez tydzień. Napisz treść swojej reklamy, kliknij Zamieść by dodać katalogu ogłoszeń. -Po zamieszczeniu reklamy zostaniesz poproszony o sprecyzowanie opłaty za reklamę. +Po zamieszczeniu reklamy zostaniesz poproszony o sprecyzowanie opłaty za Reklamę. Im wyższa opłata tym wyżej Twoja reklama wyświetla się w katalogu i wyszukiwarce po wpisaniu słów kluczowych. <usetemplate ignoretext="Jak stworzyć nową reklamę?" name="okcancelignore" notext="Anuluj" yestext="OK"/> </notification> @@ -340,7 +340,7 @@ Czy na pewno chcesz kontynuować? <usetemplate ignoretext="Potwierdź przed usunięciem mediów z obiektu" name="okcancelignore" notext="Nie" yestext="Tak"/> </notification> <notification name="ClassifiedSave"> - Zapisać zmiany w reklamie [NAME]? + Zapisać zmiany w Reklamie [NAME]? <usetemplate canceltext="Anuluj" name="yesnocancelbuttons" notext="Nie Zapisuj" yestext="Zapisz"/> </notification> <notification name="ClassifiedInsufficientFunds"> @@ -352,7 +352,7 @@ Czy na pewno chcesz kontynuować? <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/> </notification> <notification name="PromptGoToEventsPage"> - Odwiedzić internetową stronę imprez [SECOND_LIFE]? + Odwiedzić internetową stronę Imprez [SECOND_LIFE]? <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/> </notification> <notification name="SelectProposalToView"> @@ -392,17 +392,17 @@ Usuń kilka etapów i zapisz jeszcze raz. </notification> <notification name="GestureSaveFailedObjectNotFound"> Nie można zapisać gestu ponieważ obiekt lub szafa powiązanego obiektu nie został znaleziony. -Obiekt może znajdować się zbyt daleko albo został usuniety. +Obiekt może znajdować się zbyt daleko albo został usunięty. </notification> <notification name="GestureSaveFailedReason"> - Nie można zapisać gestu z następującego powodu: [REASON]. Spróbuj zapisać jeszcze raz póżniej. + Nie można zapisać gestu z następującego powodu: [REASON]. Spróbuj zapisać jeszcze raz później. </notification> <notification name="SaveNotecardFailObjectNotFound"> Nie można zapisać notki ponieważ obiekt lub szafa powiązanego obiektu nie został znaleziony. Obiekt może znajdować się zbyt daleko albo został usuniety. </notification> <notification name="SaveNotecardFailReason"> - Nie można zapisać notki z następującego powodu: [REASON]. Spróbuj zapisać jeszcze raz póżniej. + Nie można zapisać notki z następującego powodu: [REASON]. Spróbuj zapisać jeszcze raz później. </notification> <notification name="ScriptCannotUndo"> Nie można cofnąć wszystkich zmian w Twojej wersji skryptu. @@ -411,7 +411,7 @@ Czy chcesz załadować ostatnią wersję zapisaną na serwerze? <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/> </notification> <notification name="SaveScriptFailReason"> - Nie można zapisać skryptu z następującego powodu: [REASON]. Spróbuj zapisać jeszcze raz póżniej. + Nie można zapisać skryptu z następującego powodu: [REASON]. Spróbuj zapisać jeszcze raz później. </notification> <notification name="SaveScriptFailObjectNotFound"> Nie można zapisać skryptu ponieważ obiekt w którym się zawiera nie został znaleziony. @@ -517,7 +517,7 @@ Odwiedź stronę [_URL] po więcej informacji na temat zakupu L$? </notification> <notification name="UnableToLinkObjects"> Nie można połączyć [COUNT] obiektów. -Maksimalnie można połączyć [MAX] obiektów. +Maksymalnie można połączyć [MAX] obiektów. </notification> <notification name="CannotLinkIncompleteSet"> Możesz łączyć tylko kompletne zbiory obiektów i musisz wybrać więcej niż jeden obiekt. @@ -682,7 +682,7 @@ Jeśli nadal nie możesz się teleportować wyloguj się i ponownie zaloguj. Czekamy na Twoje akcesoria. Możesz poczekać kilka minut lub zrobić relog przed następną próbą teleportacji. </notification> <notification name="too_many_uploads_tport"> - Obecnie ten region ma problemy z ładowaniem obiektów w związku z czym teleportacja bardzo sie opóznia. + Obecnie ten region ma problemy z ładowaniem obiektów w związku z czym teleportacja bardzo sie opóźnia. Spróbuj jeszcze raz za kilka minut albo teleportuj się do mniej zatłoczonego miejsca. </notification> <notification name="expired_tport"> @@ -864,10 +864,10 @@ Połączyć posiadłości? Zmiana rozdzielczości do [RESX] x [RESY] nie powidła się </notification> <notification name="ErrorUndefinedGrasses"> - Błąd: Niezdefiniowane trawy: [SPECIES] + Błąd: niezdefiniowane trawy: [SPECIES] </notification> <notification name="ErrorUndefinedTrees"> - Bład: Niezdefiniowane drzewa: [SPECIES] + Bład: niezdefiniowane drzewa: [SPECIES] </notification> <notification name="CannotSaveWearableOutOfSpace"> Nie można zapisać '[NAME]' do pliku stroju. Musisz zwolnić trochę miejsca na Twoim komputerze i zapisać strój jeszcze raz. @@ -930,7 +930,7 @@ ze wszystkich posiadłości w tym symulatorze? <usetemplate name="okcancelbuttons" notext="Anuluj" yestext="OK"/> </notification> <notification name="BlankClassifiedName"> - Musisz nadać tytuł Twojej reklamie. + Musisz nadać tytuł Twojej Reklamie. </notification> <notification name="MinClassifiedPrice"> Minimalna cena za publikację wynosi [MIN_PRICE]L$. @@ -1132,10 +1132,10 @@ Zamień teksturę [TEXTURE_NUM] na 24-o bitową teksturę o wymiarze 512x512 lub Maksymalna liczba gości wynosi [MAX_AGENTS]. </notification> <notification name="MaxBannedAgentsOnRegion"> - Maksymalna liczba nieporządanych Rezydentów (banów) wynosi [MAX_BANNED]. + Maksymalna liczba niepożądanych Rezydentów (banów) wynosi [MAX_BANNED]. </notification> <notification name="MaxAgentOnRegionBatch"> - Próba dodania [NUM_ADDED] osób nie powidła się: + Próba dodania [NUM_ADDED] osób nie powiodła się: [MAX_AGENTS] [LIST_TYPE] limit przekroczony o [NUM_EXCESS]. </notification> <notification name="MaxAllowedGroupsOnRegion"> @@ -1223,7 +1223,7 @@ Pobrać i zapisać w folderze Aplikacji? <usetemplate name="okcancelbuttons" notext="Kontynuuj" yestext="Załaduj"/> </notification> <notification name="DeedObjectToGroup"> - Przekazanie tego obiektu spowoduje, że grupa: + Przekazanie tego obiektu spowoduje, że Grupa: * Otrzyma L$ zapłacone temu obiektowi <usetemplate ignoretext="Proszę potwierdzić decyzję przed przepisaniem obiektu do grupy" name="okcancelignore" notext="Anuluj" yestext="Przekaż"/> </notification> @@ -1583,7 +1583,7 @@ Zazwyczaj musi upłynąć nieco czasu zanim ta zmiana zostanie odzwierciedlona n Aby wejść do regionu Adult, Rezydenci muszą posiadać zweryfikowane konto, albo w wyniku weryfikacji wieku albo płatości. </notification> <notification label="Wersja Niezgodna z Systemem Rozmów" name="VoiceVersionMismatch"> - Ta wersja [APP_NAME] nie jest kompatybilna z systemem Rozmów w tym regionie. Musisz zainstalować aktualną wersję [APP_NAME] komunikacja głosowa działała poprawnie. + Ta wersja [APP_NAME] nie jest kompatybilna z systemem rozmów w tym Regionie. Musisz zainstalować aktualną wersję [APP_NAME] aby komunikacja głosowa działała poprawnie. </notification> <notification label="Nie Można Kupić Obiektów" name="BuyObjectOneOwner"> Jednorazowo możesz kupować tylko od jednego właściciela. @@ -1660,20 +1660,20 @@ Wpisz hasło ponownie i kliknij OK. </notification> <notification name="SetPickLocation"> Uwaga: -Lokacja tego wyboru została zaktualizowana ale pozostałe szczegóły zachowają oryginalne wartości. +Lokalizacja tego wyboru została zaktualizowana ale pozostałe szczegóły zachowają oryginalne wartości. <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="MoveInventoryFromObject"> - Wybrane obiekty szafy nie mają praw kopiowania. -Obiekty zostaną przeniesione do Twojej szafy, nie zostaną skopiowane. + Wybrane obiekty Szafy nie mają praw kopiowania. +Obiekty zostaną przeniesione do Twojej Szafy, nie zostaną skopiowane. -Przenieść obiekty szafy? +Przenieść obiekty Szafy? <usetemplate ignoretext="Uprzedź przed przeniesieniem zawartości niekopiowalnej z obiektu" name="okcancelignore" notext="Anuluj" yestext="OK"/> </notification> <notification name="MoveInventoryFromScriptedObject"> - Wybrane obiekty szafy nie mają praw kopiowania. + Wybrane obiekty Szafy nie mają praw kopiowania. Obiekty zostaną przeniesione do Twojej Szafy, nie zostaną skopiowane. -Ponieważ obiekty zawierają skrypty, przeniesienie obiektów do Twojej szafy może spowodować niepoprawne działanie skryptów. +Ponieważ obiekty zawierają skrypty, przeniesienie obiektów do Twojej Szafy może spowodować niepoprawne działanie skryptów. Przenieść obiekty szafy? <usetemplate ignoretext="Uprzedź przed przeniesieniem zawartości niekopiowalnej z obiektu, która może uszkodzić skrypty obiektu" name="okcancelignore" notext="Anuluj" yestext="OK"/> @@ -1837,7 +1837,7 @@ Zamieść go na stronie internetowej żeby umożliwić innym łatwy dostęp do t Ustawienie już istnieje! </notification> <notification name="WaterNoEditDefault"> - Domyśle ustawienie nie może być zmienione ani usunięte. + Domyślne ustawienie nie może być zmienione ani usunięte. </notification> <notification name="ChatterBoxSessionStartError"> Błąd podczas rozpoczynania czatu/IM z [RECIPIENT]. @@ -2025,7 +2025,7 @@ i wybierając folder Zapisane Miejsca (LM). (Kliknij dwa razy na miejsce (LM) i wybierz 'Teleport' żeby tam się przenieść.) </notification> <notification name="TeleportToPerson"> - Możesz skontaktować się z Rezydentem '[NAME]' poprzez otworzenie panelu Ludzie po prawej stronei ekranu. + Możesz skontaktować się z Rezydentem '[NAME]' poprzez otworzenie panelu Ludzie po prawej stronie ekranu. Wybierz Rezydenta z listy, następnie kliknij 'IM' na dole panelu. (Możesz także kliknąć podwójnie na ich imię na liście, lub prawym przyciskiem i wybrać 'IM'). </notification> diff --git a/indra/newview/skins/default/xui/pl/panel_audio_device.xml b/indra/newview/skins/default/xui/pl/panel_audio_device.xml index fc3b3776f0..fa8dde77eb 100644 --- a/indra/newview/skins/default/xui/pl/panel_audio_device.xml +++ b/indra/newview/skins/default/xui/pl/panel_audio_device.xml @@ -13,7 +13,7 @@ Poziom Wejścia </text> <text_editor name="voice_intro_text1"> - Użyj suwaka by dostosować jak głośno Cię słychać dla innych Rezydentów. By przetestować poziom wejścia, zacznij mówić do mikrofonu. + Użyj suwaka by dostosować jak głośno Cię słychać dla innych Rezydentów. W celu przetestowania poziomu wejścia, zacznij mówić do mikrofonu. </text_editor> <volume_slider name="mic_volume_slider" tool_tip="By zmienić poziom głośności użyj suwaka" /> diff --git a/indra/newview/skins/default/xui/pl/panel_bottomtray.xml b/indra/newview/skins/default/xui/pl/panel_bottomtray.xml index 043db94c95..e21d8a077d 100644 --- a/indra/newview/skins/default/xui/pl/panel_bottomtray.xml +++ b/indra/newview/skins/default/xui/pl/panel_bottomtray.xml @@ -16,7 +16,7 @@ <gesture_combo_list label="Gestury" name="Gesture" tool_tip="Pokazuje/Ukrywa gestury"/> </layout_panel> <layout_panel name="movement_panel"> - <button label="Move" name="movement_btn" tool_tip="Pokaż/Ukryj Ustawienia Ruchu"/> + <button label="Ruch" name="movement_btn" tool_tip="Pokaż/Ukryj Ustawienia Ruchu"/> </layout_panel> <layout_panel name="cam_panel"> <button label="Widok" name="camera_btn" tool_tip="Pokaż/Ukryj Ustawienia Kamery"/> diff --git a/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml b/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml index 8be5324dd4..77d2e86b7e 100644 --- a/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml +++ b/indra/newview/skins/default/xui/pl/panel_bottomtray_lite.xml @@ -2,7 +2,7 @@ <panel name="bottom_tray_lite"> <layout_stack name="toolbar_stack_lite"> <layout_panel name="gesture_panel"> - <gesture_combo_list label="Gestura" name="Gesture" tool_tip="Pokaż/ukryj gestury"/> + <gesture_combo_list label="Gest" name="Gest" tool_tip="Pokaż/ukryj gestury"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml b/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml index bf3c0f4789..f4ea9303aa 100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_jacket.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_jacket_panel"> <panel name="avatar_jacket_color_panel"> - <texture_picker label="Górny Materiał" name="Upper Fabric" tool_tip="Kliknij aby wybrać teksturę"/> - <texture_picker label="Dolny Materiał" name="Lower Fabric" tool_tip="Kliknij aby wybrać teksturę"/> + <texture_picker label="Górny materiał" name="Upper Fabric" tool_tip="Kliknij aby wybrać teksturę"/> + <texture_picker label="Dolny materiał" name="Lower Fabric" tool_tip="Kliknij aby wybrać teksturę"/> <color_swatch label="Kolor/Barwa" name="Color/Tint" tool_tip="Kliknij aby wybrać kolor"/> </panel> <accordion name="wearable_accordion"> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml index f07f5496be..22fb00671d 100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_pick.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_pick.xml @@ -21,7 +21,7 @@ <text name="pick_location"> ładowanie... </text> - <button label="Ustaw na Bieżąca Lokalizacje" name="set_to_curr_location_btn"/> + <button label="Ustaw na bieżąca lokalizację" name="set_to_curr_location_btn"/> </panel> </scroll_container> <panel label="bottom_panel" name="bottom_panel"> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml index 3f3d32c9fc..edd7415751 100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_profile.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_profile.xml @@ -10,11 +10,11 @@ <string name="AcctTypeTrial" value="Próbne"/> <string name="AcctTypeCharterMember" value="Członek-zalożyciel"/> <string name="AcctTypeEmployee" value="Pracownik Linden Lab"/> - <string name="PaymentInfoUsed" value="Dane Konta Używane"/> - <string name="PaymentInfoOnFile" value="Dane Konta Dostępne"/> - <string name="NoPaymentInfoOnFile" value="Brak Danych Konta"/> - <string name="AgeVerified" value="Wiek Zweryfikowany"/> - <string name="NotAgeVerified" value="Brak Weryfikacji Wieku"/> + <string name="PaymentInfoUsed" value="Dane konta używane"/> + <string name="PaymentInfoOnFile" value="Dane konta dostępne"/> + <string name="NoPaymentInfoOnFile" value="Brak danych konta"/> + <string name="AgeVerified" value="Wiek zweryfikowany"/> + <string name="NotAgeVerified" value="Brak weryfikacji wieku"/> <string name="partner_edit_link_url"> http://www.secondlife.com/account/partners.php?lang=pl </string> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml index 5efa402698..b5e1828588 100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_tattoo.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_tattoo_panel"> <panel name="avatar_tattoo_color_panel"> - <texture_picker label="Tatuaż Głowy" name="Head Tattoo" tool_tip="Kliknij by wybrać grafikę"/> - <texture_picker label="Tatuaż Górnej Części Ciała" name="Upper Tattoo" tool_tip="Kliknij by wybrać grafikę"/> - <texture_picker label="Tatuaż Dolnej Części Ciała" name="Lower Tattoo" tool_tip="Kliknij by wybrać grafikę"/> + <texture_picker label="Tatuaż głowy" name="Head Tattoo" tool_tip="Kliknij by wybrać grafikę"/> + <texture_picker label="Tatuaż górnej części ciała" name="Upper Tattoo" tool_tip="Kliknij by wybrać grafikę"/> + <texture_picker label="Tatuaż dolnej części ciała" name="Lower Tattoo" tool_tip="Kliknij by wybrać grafikę"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml b/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml index 9bd89f0b36..cf17afea3f 100644 --- a/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml +++ b/indra/newview/skins/default/xui/pl/panel_edit_wearable.xml @@ -4,46 +4,46 @@ Edycja kształtu </string> <string name="edit_skin_title"> - Edycja Skórki + Edycja skórki </string> <string name="edit_hair_title"> - Edycja Włosów + Edycja włosów </string> <string name="edit_eyes_title"> - Edycja Oczu + Edycja oczu </string> <string name="edit_shirt_title"> - Edycja Spódnicy + Edycja spódnicy </string> <string name="edit_pants_title"> - Edycja Spodni + Edycja spodni </string> <string name="edit_shoes_title"> - Edycja Butów + Edycja butów </string> <string name="edit_socks_title"> - Edycja Skarpetek + Edycja skarpetek </string> <string name="edit_jacket_title"> - Edycja Kurtki + Edycja kurtki </string> <string name="edit_skirt_title"> - Edycja Spódnicy + Edycja spódnicy </string> <string name="edit_gloves_title"> - Edycja Rękawiczek + Edycja rękawiczek </string> <string name="edit_undershirt_title"> - Edycja Podkoszulki + Edycja podkoszulki </string> <string name="edit_underpants_title"> - Edycja Bielizny + Edycja bielizny </string> <string name="edit_alpha_title"> - Edycja Maski Alpha + Edycja maski Alpha </string> <string name="edit_tattoo_title"> - Edycja Tatuażu + Edycja tatuażu </string> <string name="shape_desc_text"> Kształt: diff --git a/indra/newview/skins/default/xui/pl/panel_group_general.xml b/indra/newview/skins/default/xui/pl/panel_group_general.xml index 0dc955c096..67fa0bf085 100644 --- a/indra/newview/skins/default/xui/pl/panel_group_general.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_general.xml @@ -18,7 +18,7 @@ By otrzymać pomoc i dodatkowe wskazówki przesuń kursor na przyciski. </text> <name_box initial_value="(przetwarzanie)" name="founder_name"/> <text name="join_cost_text"> - Wstęp Wolny + Wstęp wolny </text> <button label="DOŁĄCZ TERAZ!" name="btn_join"/> </panel> @@ -43,8 +43,8 @@ By otrzymać pomoc i dodatkowe wskazówki przesuń kursor na przyciski. <text name="group_settngs_label"> Grupa </text> - <check_box label="Wolny Wstęp" name="open_enrollement" tool_tip="Sprawdź czy grupa oferuje wolny wstęp i nie wymaga zaproszenia."/> - <check_box label="Opłata Wstępu" name="check_enrollment_fee" tool_tip="Ustaw opłatę za przyłączenie się do grupy."/> + <check_box label="Wolny wstęp" name="open_enrollement" tool_tip="Sprawdź czy grupa oferuje wolny wstęp i nie wymaga zaproszenia."/> + <check_box label="Opłata wstępu" name="check_enrollment_fee" tool_tip="Ustaw opłatę za przyłączenie się do grupy."/> <spinner label="L$" name="spin_enrollment_fee" tool_tip="Nowi członkowie grupy muszą zapłacić wymaganą opłatę by dołączyć do grupy."/> <combo_box name="group_mature_check" tool_tip="Wybierz jeżeli uważasz, iż Twoja grupa klasyfikowana jest jako 'Mature'."> <combo_box.item label="Treść 'PG'" name="pg"/> diff --git a/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml b/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml index dd4938d50b..509c2893cf 100644 --- a/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_info_sidetray.xml @@ -29,7 +29,7 @@ <button label="Czat" name="btn_chat"/> <button label="Konferencja Głosowa" name="btn_call" tool_tip="Konferencja Głosowa"/> <button label="Zapisz" label_selected="Zapisz" name="btn_apply"/> - <button label="Stwórz nową grupę" name="btn_create" tool_tip="Stwórz nową grupę"/> + <button label="Stwórz nową Grupę" name="btn_create" tool_tip="Stwórz nową Grupę"/> </layout_panel> </layout_stack> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_group_invite.xml b/indra/newview/skins/default/xui/pl/panel_group_invite.xml index 335fff8458..e520c06944 100644 --- a/indra/newview/skins/default/xui/pl/panel_group_invite.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_invite.xml @@ -4,7 +4,7 @@ Jesteś pewny, że chcesz wybrać nowych właścieli grupy? Ta decyzja jest ostateczna! </panel.string> <panel.string name="loading"> - (loading...) + (ładowanie...) </panel.string> <panel.string name="already_in_group"> Niektórzy Rezydenci, których wybrałeś już należą do grupy i nie otrzymali zaproszenia. diff --git a/indra/newview/skins/default/xui/pl/panel_group_notices.xml b/indra/newview/skins/default/xui/pl/panel_group_notices.xml index c973bcd24f..31882ab0e6 100644 --- a/indra/newview/skins/default/xui/pl/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/pl/panel_group_notices.xml @@ -39,11 +39,11 @@ Limit dzienny ogłoszeń dla grupy wynosi 200. </text> <button label="Usuń załącznik" label_selected="Usuń Załącznik" name="remove_attachment" tool_tip="Usuń załącznik z noty"/> <button label="Wyślij" label_selected="Wyślij" name="send_notice"/> - <group_drop_target name="drop_target" tool_tip="Przeciągnij załącznik ze swojej Szafy na pole docelowe aby wysłać go z ogłoszeniem. Musisz posiadać prawo do kopiowania i transferu załącznika aby go dodać do ogłoszenia."/> + <group_drop_target name="drop_target" tool_tip="Przeciągnij załącznik ze swojej Szafy na pole docelowe aby wysłać go z Ogłoszeniem. Musisz posiadać prawo do kopiowania i transferu załącznika aby go dodać do ogłoszenia."/> </panel> - <panel label="Zobacz Przeszłe Ogłoszenia" name="panel_view_past_notice"> + <panel label="Zobacz przeszłe Ogłoszenia" name="panel_view_past_notice"> <text name="lbl"> - Ogłoszenia Zachowane + Ogłoszenia zachowane </text> <text name="lbl2"> W celu wysłania nowego ogłoszenia kliknij przycisk + diff --git a/indra/newview/skins/default/xui/pl/panel_landmarks.xml b/indra/newview/skins/default/xui/pl/panel_landmarks.xml index ccd3409015..dcc495b5a8 100644 --- a/indra/newview/skins/default/xui/pl/panel_landmarks.xml +++ b/indra/newview/skins/default/xui/pl/panel_landmarks.xml @@ -2,7 +2,7 @@ <panel name="Landmarks"> <accordion name="landmarks_accordion"> <accordion_tab name="tab_favorites" title="Ulubione"/> - <accordion_tab name="tab_landmarks" title="Miejsca Zapisane"/> + <accordion_tab name="tab_landmarks" title="Landmarki"/> <accordion_tab name="tab_inventory" title="Moja Szafa"/> <accordion_tab name="tab_library" title="Biblioteka"/> </accordion> diff --git a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml index 648f6e2ff0..e0d9def8b3 100644 --- a/indra/newview/skins/default/xui/pl/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/pl/panel_main_inventory.xml @@ -13,10 +13,10 @@ <menu label="Plik" name="File"> <menu_item_call label="Otwórz" name="Open"/> <menu label="Załaduj" name="upload"> - <menu_item_call label="Obraz (L$[COST])..." name="Upload Image"/> - <menu_item_call label="Dźwięk (L$[COST])..." name="Upload Sound"/> - <menu_item_call label="Animację (L$[COST])..." name="Upload Animation"/> - <menu_item_call label="Zbiór Plików (L$[COST] za jeden plik)..." name="Bulk Upload"/> + <menu_item_call label="obraz (L$[COST])..." name="Upload Image"/> + <menu_item_call label="dźwięk (L$[COST])..." name="Upload Sound"/> + <menu_item_call label="animację (L$[COST])..." name="Upload Animation"/> + <menu_item_call label="zbiór plików (L$[COST] za jeden plik)..." name="Bulk Upload"/> </menu> <menu_item_call label="Nowe Okno" name="New Window"/> <menu_item_call label="Pokaż Filtry" name="Show Filters"/> @@ -26,41 +26,41 @@ <menu_item_call label="Opróżnij Folder Zgubione i Znalezione" name="Empty Lost And Found"/> </menu> <menu label="Stwórz" name="Create"> - <menu_item_call label="Nowy Folder" name="New Folder"/> - <menu_item_call label="Nowy Skrypt" name="New Script"/> - <menu_item_call label="Nowa Nota" name="New Note"/> - <menu_item_call label="Nową Gesturkę" name="New Gesture"/> + <menu_item_call label="Nowy folder" name="New Folder"/> + <menu_item_call label="Nowy skrypt" name="New Script"/> + <menu_item_call label="Nowa nota" name="New Note"/> + <menu_item_call label="Nowy gest" name="New Gesture"/> <menu label="Nowe Ubranie" name="New Clothes"> - <menu_item_call label="Nową Koszulkę" name="New Shirt"/> - <menu_item_call label="Nowe Spodnie" name="New Pants"/> - <menu_item_call label="Nowe Buty" name="New Shoes"/> - <menu_item_call label="Nowe Skarpetki" name="New Socks"/> - <menu_item_call label="Nową Kurtkę" name="New Jacket"/> - <menu_item_call label="Nową Spódnicę" name="New Skirt"/> - <menu_item_call label="Nowe Rękawiczki" name="New Gloves"/> - <menu_item_call label="Nowy Podkoszulek" name="New Undershirt"/> - <menu_item_call label="Nową Bieliznę" name="New Underpants"/> - <menu_item_call label="Nowe Ubranie Przezroczyste" name="New Alpha"/> - <menu_item_call label="Nowy Tatuaż" name="New Tattoo"/> + <menu_item_call label="Nową kkoszulkę" name="New Shirt"/> + <menu_item_call label="Nowe spodnie" name="New Pants"/> + <menu_item_call label="Nowe buty" name="New Shoes"/> + <menu_item_call label="Nowe skarpetki" name="New Socks"/> + <menu_item_call label="Nową kurtkę" name="New Jacket"/> + <menu_item_call label="Nową spódnicę" name="New Skirt"/> + <menu_item_call label="Nowe rękawiczki" name="New Gloves"/> + <menu_item_call label="Nowy podkoszulek" name="New Undershirt"/> + <menu_item_call label="Nową bieliznę" name="New Underpants"/> + <menu_item_call label="Nowe ubranie Alpha" name="New Alpha"/> + <menu_item_call label="Nowy tatuaż" name="New Tattoo"/> </menu> <menu label="Nową Część Ciała" name="New Body Parts"> - <menu_item_call label="Nowy Kształt" name="New Shape"/> - <menu_item_call label="Nową Skórkę" name="New Skin"/> - <menu_item_call label="Nowe Włosy" name="New Hair"/> - <menu_item_call label="Nowe Oczy" name="New Eyes"/> + <menu_item_call label="Nowy kształt" name="New Shape"/> + <menu_item_call label="Nową skórkę" name="New Skin"/> + <menu_item_call label="Nowe włosy" name="New Hair"/> + <menu_item_call label="Nowe oczy" name="New Eyes"/> </menu> </menu> <menu label="Uporządkuj" name="Sort"> - <menu_item_check label="Wegług Nazwy" name="By Name"/> - <menu_item_check label="Według Daty" name="By Date"/> + <menu_item_check label="Wegług bazwy" name="By Name"/> + <menu_item_check label="Według daty" name="By Date"/> <menu_item_check label="Foldery zawsze według nazwy" name="Folders Always By Name"/> - <menu_item_check label="Foldery Systemowe od Góry" name="System Folders To Top"/> + <menu_item_check label="Foldery Systemowe od góry" name="System Folders To Top"/> </menu> </menu_bar> <filter_editor label="Filtr" name="inventory search editor"/> <tab_container name="inventory filter tabs"> - <inventory_panel label="Wszystkie Obiekty" name="All Items"/> - <inventory_panel label="Ostatnio Dodane Obiekty" name="Recent Items"/> + <inventory_panel label="Wszystkie obiekty" name="All Items"/> + <inventory_panel label="Ostatnio dodane obiekty" name="Recent Items"/> </tab_container> <panel name="bottom_panel"> <button name="options_gear_btn" tool_tip="Pokaż dodatkowe opcje"/> diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml index 4d91c3cdc8..939bcbbb42 100644 --- a/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml +++ b/indra/newview/skins/default/xui/pl/panel_media_settings_permissions.xml @@ -11,10 +11,10 @@ Mini </combo_item> </combo_box> - <check_box initial_value="false" label="Pozwól na Nawigację & Interaktywność" name="perms_owner_interact"/> + <check_box initial_value="false" label="Pozwól na nawigację & interaktywność" name="perms_owner_interact"/> <check_box initial_value="false" label="Pokaż Pasek Kontroli" name="perms_owner_control"/> - <check_box initial_value="false" label="Pozwól na Nawigację & Interaktywność" name="perms_group_interact"/> + <check_box initial_value="false" label="Pozwól na nawigację & Interaktywność" name="perms_group_interact"/> <check_box initial_value="false" label="Pokaż Pasek Kontroli" name="perms_group_control"/> - <check_box initial_value="false" label="Pozwól na Nawigację & Interaktywność" name="perms_anyone_interact"/> + <check_box initial_value="false" label="Pozwól na nawigację & interaktywność" name="perms_anyone_interact"/> <check_box initial_value="false" label="Pokaż Pasek Kontroli" name="perms_anyone_control"/> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml b/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml index a9b5e71a3b..da3142b54e 100644 --- a/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml +++ b/indra/newview/skins/default/xui/pl/panel_media_settings_security.xml @@ -7,6 +7,6 @@ <button label="Dodaj" name="whitelist_add"/> <button label="Usuń" name="whitelist_del"/> <text name="home_url_fails_whitelist"> - UWAGA: WWW wyszczególnione w Ogólne nie przeszły białej listy. Została ona wyłączona dopóki poprawny zapis nie zostanie dodany. + UWAGA: WWW wyszczególnione w Ogólne nie przeszły Białej Listy. Została ona wyłączona dopóki poprawny zapis nie zostanie dodany. </text> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_my_profile.xml b/indra/newview/skins/default/xui/pl/panel_my_profile.xml index 4f0b6dc42c..7ca762b825 100644 --- a/indra/newview/skins/default/xui/pl/panel_my_profile.xml +++ b/indra/newview/skins/default/xui/pl/panel_my_profile.xml @@ -10,11 +10,11 @@ <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> <panel name="second_life_image_panel"> - <icon label="" name="2nd_life_edit_icon" tool_tip="Kliknij przycisk Edytuj Profil by zmienić zdjecie"/> + <icon label="" name="2nd_life_edit_icon" tool_tip="Kliknij przycisk Edytuj Profil by zmienić zdjęcie"/> <text name="title_sl_descr_text" value="[SECOND_LIFE]:"/> </panel> <panel name="first_life_image_panel"> - <icon label="" name="real_world_edit_icon" tool_tip="Kliknij przycisk Edytuj Profil by zmienić zdjecie"/> + <icon label="" name="real_world_edit_icon" tool_tip="Kliknij przycisk Edytuj Profil by zmienić zdjęcie"/> <text name="title_rw_descr_text" value="Życie#1:"/> </panel> <text name="title_member_text" value="Urodziny:"/> diff --git a/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml b/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml index 3e6cad59bf..b01e686c41 100644 --- a/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml +++ b/indra/newview/skins/default/xui/pl/panel_navigation_bar.xml @@ -9,8 +9,8 @@ <combo_editor label="Szukaj [SECOND_LIFE]" name="search_combo_editor"/> </search_combo_box> </panel> - <favorites_bar name="favorite" tool_tip="Przeciągnij swoje zapisane miejsca tutaj by szybko dostać się do swoich ulubionych miejsc w Second Life!"> - <label name="favorites_bar_label" tool_tip="Przeciągnij swoje zapisane miejsca tutaj by szybko dostać się do swoich ulubionych miejsc w Second Life!"> + <favorites_bar name="favorite" tool_tip="Przeciągnij swoje landmarki tutaj by szybko dostać się do swoich ulubionych miejsc w Second Life!"> + <label name="favorites_bar_label" tool_tip="Przeciągnij swoje landmarki tutaj by szybko dostać się do swoich ulubionych miejsc w Second Life!"> Pasek Ulubionych </label> <chevron_button name=">>" tool_tip="Pokaż więcej Moich Ulubionych"/> diff --git a/indra/newview/skins/default/xui/pl/panel_nearby_media.xml b/indra/newview/skins/default/xui/pl/panel_nearby_media.xml index 2c47d2a736..a05c0d856f 100644 --- a/indra/newview/skins/default/xui/pl/panel_nearby_media.xml +++ b/indra/newview/skins/default/xui/pl/panel_nearby_media.xml @@ -4,10 +4,10 @@ <empty> </string> <string name="parcel_media_name"> - Strumień Mediów Parceli + Strumień Mediów Posiadłości </string> <string name="parcel_audio_name"> - Strumień Audio Parceli + Strumień Audio Posiadłości </string> <string name="playing_suffix"> (odtwarzanie) @@ -28,7 +28,7 @@ <combo_box name="show_combo"> <combo_box.item label="Wszystkie" name="All"/> <combo_box.item label="Na obecnej Parceli" name="WithinParcel"/> - <combo_box.item label="Poza Parcelą" name="OutsideParcel"/> + <combo_box.item label="Poza Posiadłością" name="OutsideParcel"/> <combo_box.item label="Na innych awatarach" name="OnOthers"/> </combo_box> <scroll_list name="media_list"> diff --git a/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml b/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml index 8eaf152fb6..5b77c390ca 100644 --- a/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml +++ b/indra/newview/skins/default/xui/pl/panel_outfits_inventory_gear_default.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <menu name="menu_gear_default"> - <menu_item_call label="Zastąp Aktualny Stroju" name="wear"/> - <menu_item_call label="Dodaj do Aktualnego Stroju" name="add"/> - <menu_item_call label="Usuń z Aktualnego Stroju" name="remove"/> + <menu_item_call label="Zastąp Obecne Ubranie" name="wear"/> + <menu_item_call label="Dodaj do Obecnego Ubrania" name="add"/> + <menu_item_call label="Usuń z Obecnego Ubrania" name="remove"/> <menu_item_call label="Zmień nazwę" name="rename"/> <menu_item_call label="Usuń Link" name="remove_link"/> <menu_item_call label="Usuń Ubranie" name="delete"/> diff --git a/indra/newview/skins/default/xui/pl/panel_people.xml b/indra/newview/skins/default/xui/pl/panel_people.xml index b92a37907b..5ea5356c60 100644 --- a/indra/newview/skins/default/xui/pl/panel_people.xml +++ b/indra/newview/skins/default/xui/pl/panel_people.xml @@ -3,12 +3,12 @@ <panel label="Ludzie" name="people_panel"> <string name="no_people" value="Brak ludzi"/> <string name="no_one_near" value="Nikogo w pobliżu"/> - <string name="no_friends_online" value="Brak dostępnych przyjaciół"/> - <string name="no_friends" value="Brak przyjaciół"/> + <string name="no_friends_online" value="Brak dostępnych Znajomych"/> + <string name="no_friends" value="Brak Znajomych"/> <string name="people_filter_label" value="Filtruj Ludzi"/> <string name="groups_filter_label" value="Filtruj Grupy"/> - <string name="no_filtered_groups_msg" value="[secondlife:///app/search/groups Try finding the group in search?]"/> - <string name="no_groups_msg" value="[secondlife:///app/search/groups Try searching for some groups to join.]"/> + <string name="no_filtered_groups_msg" value="[secondlife:///app/search/groups Może spróbuj odnaleźć Grupę korzystając z Szukaj?]"/> + <string name="no_groups_msg" value="[secondlife:///app/search/groups Spróbuj wyszukać grupy aby do nich dołączyć.]"/> <filter_editor label="Filtr" name="filter_input"/> <tab_container name="tabs"> <panel label="W POBLIŻU" name="nearby_panel"> @@ -28,8 +28,8 @@ <button name="del_btn" tool_tip="Usuń wybraną osobę ze swojej listy znajomych"/> </panel> <text name="no_friends_msg"> - By dodać nową znajomość skorzystaj ze strony [secondlife:///app/search/people global search] lub kliknij prawym przyciskiem myszki na Rezydenta by wysłać mu zaproszenie. -Jeżeli szukasz ludzi, z którymi można się spotkać, kliknij tutaj [secondlife:///app/worldmap try the Map]. + By dodać nową znajomość skorzystaj ze strony [secondlife:///app/search/people ogólne wyszukiwanie] lub kliknij prawym przyciskiem myszki na Rezydenta by wysłać mu zaproszenie. +Jeżeli szukasz ludzi, z którymi można się spotkać, kliknij tutaj [secondlife:///app/worldmap skorzystaj z mapy]. </text> </panel> <panel label="GRUPY" name="groups_panel"> diff --git a/indra/newview/skins/default/xui/pl/panel_pick_info.xml b/indra/newview/skins/default/xui/pl/panel_pick_info.xml index 5b6df28883..0454ecc430 100644 --- a/indra/newview/skins/default/xui/pl/panel_pick_info.xml +++ b/indra/newview/skins/default/xui/pl/panel_pick_info.xml @@ -3,9 +3,9 @@ <text name="title" value="Info o Ulubionych"/> <scroll_container name="profile_scroll"> <panel name="scroll_content_panel"> - <text name="pick_name" value="[nazwa]"/> - <text name="pick_location" value="[ładowanie...]"/> - <text name="pick_desc" value="[opis]"/> + <text name="pick_name" value="[name]"/> + <text name="pick_location" value="[loading...]"/> + <text name="pick_desc" value="[description]"/> </panel> </scroll_container> <panel name="buttons"> diff --git a/indra/newview/skins/default/xui/pl/panel_place_profile.xml b/indra/newview/skins/default/xui/pl/panel_place_profile.xml index 22811cd2a1..3714a141db 100644 --- a/indra/newview/skins/default/xui/pl/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/pl/panel_place_profile.xml @@ -99,7 +99,7 @@ <text name="traffic_label" value="Ruch:"/> <text name="primitives_label" value="Primy:"/> <text name="parcel_scripts_label" value="Skrypty:"/> - <text name="terraform_limits_label" value="Ograniczenia Terraformingu:"/> + <text name="terraform_limits_label" value="Ograniczenia terraformingu:"/> <text name="subdivide_label" value="Podziel/Złącz:"/> <text name="resale_label" value="Możliwość sprzedaży:"/> <text name="sale_to_label" value="Na sprzedaż:"/> diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml index d53a99e8c1..e843342aa2 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_alerts.xml @@ -4,7 +4,7 @@ Powiadom mnie: </text> <check_box label="Kiedy wydaję lub otrzymuję L$" name="notify_money_change_checkbox"/> - <check_box label="Kiedy moi znajomi zalogowują się i wylogowują" name="friends_online_notify_checkbox"/> + <check_box label="Kiedy moi Znajomi zalogowują się i wylogowują" name="friends_online_notify_checkbox"/> <text name="show_label"> Zawsze pokazuj: </text> diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml index 3fc220976f..ae13cf662f 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_chat.xml @@ -46,7 +46,7 @@ <check_box initial_value="true" label="Używaj animacji podczas pisania" name="play_typing_animation"/> <check_box label="Wysyłaj wszystkie wiadomości (IM) na moją skrzynkę pocztową kiedy jestem niedostępny" name="send_im_to_email"/> <text name="show_ims_in_label"> - Pokaż IMy w: + Pokaż wiadomości (IM) w: </text> <text name="requires_restart_label"> (restart wymagany) diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml index 37670d3470..bc08e025dd 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_graphics1.xml @@ -27,14 +27,14 @@ </text> <panel label="CustomGraphics" name="CustomGraphics Panel"> <text name="ShadersText"> - Shadery: + Cieniowanie pixeli (shadery): </text> <check_box initial_value="true" label="Mapowanie Wypukłości i Połysk" name="BumpShiny"/> <check_box initial_value="true" label="Podstawowe Shadery" name="BasicShaders" tool_tip="Wyłączenie tej opcji może naprawić błędy niektórych sterowników graficznych."/> <check_box initial_value="true" label="Shadery Atmosfery" name="WindLightUseAtmosShaders"/> - <check_box initial_value="true" label="Odbicia w Wodzie" name="Reflections"/> + <check_box initial_value="true" label="Refleksy w wodzie" name="Reflections"/> <text name="ReflectionDetailText"> - Ustawienia Odbić: + Ustawienia refleksów: </text> <radio_group name="ReflectionDetailRadio"> <radio_item label="Teren i drzewa" name="0"/> @@ -43,22 +43,22 @@ <radio_item label="Wszystko" name="3"/> </radio_group> <text name="AvatarRenderingText"> - Prezentacja Awatarów: + Rendering awatarów </text> <check_box initial_value="true" label="Impostoryzacja Awatarowa" name="AvatarImpostors"/> - <check_box initial_value="true" label="Skinning" name="AvatarVertexProgram"/> - <check_box initial_value="true" label="Ubranie Awatarów" name="AvatarCloth"/> - <slider label="Głębia Rysowania:" name="DrawDistance"/> + <check_box initial_value="true" label="Rendering awatara przez GPU" name="AvatarVertexProgram"/> + <check_box initial_value="true" label="Oddzielne warstwy ubrań" name="AvatarCloth"/> + <slider label="Pole widzenia:" name="DrawDistance"/> <text name="DrawDistanceMeterText2"> m </text> - <slider label="Liczba Cząsteczek:" name="MaxParticleCount"/> + <slider label="Liczba cząsteczek:" name="MaxParticleCount"/> <slider label="Jakość Post-Procesu:" name="RenderPostProcess"/> <text name="MeshDetailText"> - Szczegóły Meszu: + Szczególy obiektów: </text> - <slider label=" Obiekty:" name="ObjectMeshDetail"/> - <slider label=" Elastyczne:" name="FlexibleMeshDetail"/> + <slider label=" Przedmioty:" name="ObjectMeshDetail"/> + <slider label=" Obiekty elastyczne:" name="FlexibleMeshDetail"/> <slider label=" Drzewa:" name="TreeMeshDetail"/> <slider label=" Awatary:" name="AvatarMeshDetail"/> <slider label=" Teren:" name="TerrainMeshDetail"/> @@ -85,14 +85,14 @@ Mało </text> <text name="LightingDetailText"> - Ustawienia Światła: + Ustawienia świateł: </text> <radio_group name="LightingDetailRadio"> <radio_item label="Tylko Słońce i Księżyc" name="SunMoon" value="0"/> <radio_item label="Tylko Bliskie Światła" name="LocalLights" value="1"/> </radio_group> <text name="TerrainDetailText"> - Szczgóły Terenu: + Szczegóły terenu: </text> <radio_group name="TerrainDetailRadio"> <radio_item label="Niska" name="0"/> @@ -100,7 +100,7 @@ </radio_group> </panel> <button label="Zastosuj" label_selected="Zastosuj" name="Apply"/> - <button label="Zresetu" name="Defaults"/> + <button label="Zresetuj" name="Defaults"/> <button label="Zaawansowane" name="Advanced"/> <button label="Sprzęt" label_selected="Sprzęt" name="GraphicsHardwareButton"/> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml index abcb989757..b69efeb77e 100644 --- a/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml +++ b/indra/newview/skins/default/xui/pl/panel_preferences_sound.xml @@ -4,8 +4,8 @@ <check_box initial_value="true" label="Wycisz dzwięk podczas minimalizacji okna" name="mute_when_minimized"/> <slider label="Interfejs" name="UI Volume"/> <slider label="Otoczenie" name="Wind Volume"/> - <slider label="Efekty Dźwiękowe" name="SFX Volume"/> - <slider label="Muzyka Strumieniowa" name="Music Volume"/> + <slider label="Efekty dźwiękowe" name="SFX Volume"/> + <slider label="Muzyka strumieniowa" name="Music Volume"/> <check_box label="Odtwarzaj media audio" name="music_enabled"/> <slider label="Media" name="Media Volume"/> <check_box label="Odtwarzaj media" name="enable_media"/> diff --git a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml index 2cfe2ca2ce..2b37dd96b7 100644 --- a/indra/newview/skins/default/xui/pl/panel_region_covenant.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_covenant.xml @@ -58,13 +58,13 @@ wszystkich posiadłościach majątku. Odsprzedaj: </text> <text left="115" name="resellable_clause" width="350"> - Posiadłość zakupiona w tym regionie nie może być odsprzedana. + Posiadłość kupiona w tym Regionie nie może być odsprzedana. </text> <text name="changeable_lbl"> Podziel: </text> <text left="115" name="changeable_clause" width="350"> - Posiadłość zakupiona w tym regionie nie może być + Posiadłość kupiona w tym Regionie nie może być łączona/dzielona. </text> <string name="can_resell"> diff --git a/indra/newview/skins/default/xui/pl/panel_region_debug.xml b/indra/newview/skins/default/xui/pl/panel_region_debug.xml index 14fa3cd94c..c5b08383dc 100644 --- a/indra/newview/skins/default/xui/pl/panel_region_debug.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_debug.xml @@ -6,15 +6,15 @@ <text name="region_text"> brak danych </text> - <check_box label="Zablokuj Skrypty" name="disable_scripts_check" tool_tip="Zablokuj wszystkie skrypty w tym Regionie"/> + <check_box label="Zablokuj skrypty" name="disable_scripts_check" tool_tip="Zablokuj wszystkie skrypty w tym Regionie"/> <button label="?" name="disable_scripts_help"/> - <check_box label="Zablokuj Kolizje" name="disable_collisions_check" tool_tip="Zablokuj kolizje obiektów (nie Awatarów) w tym Regionie"/> + <check_box label="Zablokuj kolizje" name="disable_collisions_check" tool_tip="Zablokuj kolizje obiektów (nie awatarów) w tym Regionie"/> <button label="?" name="disable_collisions_help"/> - <check_box label="Zablokuj Fizykę" name="disable_physics_check" tool_tip="Zablokuj wpływ fizyki w tym Regionie"/> + <check_box label="Zablokuj fizykę" name="disable_physics_check" tool_tip="Zablokuj wpływ fizyki w tym Regionie"/> <button label="?" name="disable_physics_help"/> <button label="Zastosuj" name="apply_btn"/> <text name="objret_text_lbl"> - Zwrot Obiektu + Zwrot obiektu </text> <text name="resident_text_lbl"> Rezydent: @@ -30,11 +30,11 @@ <check_box label="Odeślij wyłącznie obiekty które są na posiadłościach innych osób" name="return_other_land" tool_tip="Odeślij wyłącznie obiekty które są na posiadłościach innych osób"/> <check_box label="W każdym regionie tego majątku" name="return_estate_wide" tool_tip="Odeślij obiekty z wszystkich regionów w tym majątku"/> <button label="Odeślij" name="return_btn"/> - <button label="Znajdź Główne Kolizje..." name="top_colliders_btn" tool_tip="Lista obiektów doświadczających najwięcej potencjalnych kolizji"/> + <button label="Znajdź główne kolizje..." name="top_colliders_btn" tool_tip="Lista obiektów doświadczających najwięcej potencjalnych kolizji"/> <button label="?" name="top_colliders_help"/> - <button label="Główne Skrypty..." name="top_scripts_btn" tool_tip="Lista obiektów najdłużej wykonujących skrypty"/> + <button label="Główne skrypty..." name="top_scripts_btn" tool_tip="Lista obiektów najdłużej wykonujących skrypty"/> <button label="?" name="top_scripts_help"/> <button label="Restart Regionu" name="restart_btn" tool_tip="Odliczanie i restart Regionu za dwie minuty"/> <button label="?" name="restart_help"/> - <button label="Opóźnij Restart" name="cancel_restart_btn" tool_tip="Opóźnij restart Regionu o godzinę"/> + <button label="Opóźnij restart" name="cancel_restart_btn" tool_tip="Opóźnij restart Regionu o godzinę"/> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_region_estate.xml b/indra/newview/skins/default/xui/pl/panel_region_estate.xml index 78da656448..a796274738 100644 --- a/indra/newview/skins/default/xui/pl/panel_region_estate.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_estate.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Majątek" name="Estate"> <text name="estate_help_text"> - Zmiany w tej zakładce będą odczuwalne w całym regionie. + Zmiany w tej zakładce będą odczuwalne w całym Regionie. </text> <text name="estate_text"> Majątek: @@ -15,19 +15,19 @@ <text name="estate_owner"> (brak danych) </text> - <check_box label="Używaj Czasu Światowego" name="use_global_time_check"/> + <check_box label="Używaj czasu światowego" name="use_global_time_check"/> <button label="?" name="use_global_time_help"/> <check_box label="Stałe Słońce" name="fixed_sun_check"/> <button label="?" name="fixed_sun_help"/> - <slider label="Pora Doby" name="sun_hour_slider"/> - <check_box label="Dostęp Publiczny" name="externally_visible_check"/> + <slider label="Pora doby" name="sun_hour_slider"/> + <check_box label="Dostęp publiczny" name="externally_visible_check"/> <button label="?" name="externally_visible_help"/> <text name="Only Allow"> - Ogranicz Dostęp dla kont zweryfikowanych przez: + Ogranicz dostęp dla kont zweryfikowanych przez: </text> <check_box label="Rezydenci z danymi o koncie" name="limit_payment" tool_tip="Zbanuj niezidentyfikowanych Rezydentów"/> <check_box label="Rezydenci, którzy dokonali weryfikacji wieku" name="limit_age_verified" tool_tip="Zbanuj Rezydentów, którzy nie zweryfikowali swojego wieku. Odwiedź stronę [SUPPORT_SITE] po więcej informacji."/> - <check_box label="Rozmowy Dozwolone" name="voice_chat_check"/> + <check_box label="Rozmowy dozwolone" name="voice_chat_check"/> <button label="?" name="voice_chat_help"/> <check_box label="Teleportacja Dozwolona" name="allow_direct_teleport"/> <button label="?" name="allow_direct_teleport_help"/> diff --git a/indra/newview/skins/default/xui/pl/panel_region_general.xml b/indra/newview/skins/default/xui/pl/panel_region_general.xml index 26076b9a1a..1410a2a882 100644 --- a/indra/newview/skins/default/xui/pl/panel_region_general.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_general.xml @@ -18,16 +18,16 @@ <text name="region_type"> nieznany </text> - <check_box label="Zablokuj Zmiany Terenu" name="block_terraform_check"/> - <check_box label="Zablokuj Latanie" name="block_fly_check"/> - <check_box label="Uszkodzenia Dozwolone" name="allow_damage_check"/> - <check_box label="Zablokuj Popychanie" name="restrict_pushobject"/> - <check_box label="Odsprzedaż Dozwolona" name="allow_land_resell_check"/> - <check_box label="Łączenie/Dzielenie Dozwolone" name="allow_parcel_changes_check"/> - <check_box label="Zablokuj Wyszukiwanie" name="block_parcel_search_check" tool_tip="Pozwól na wyświetlanie nazwy regionu i posiadłości w wynikach wyszukiwania"/> + <check_box label="Zablokuj zmiany terenu" name="block_terraform_check"/> + <check_box label="Zablokuj latanie" name="block_fly_check"/> + <check_box label="Uszkodzenia dozwolone" name="allow_damage_check"/> + <check_box label="Zablokuj popychanie" name="restrict_pushobject"/> + <check_box label="Odsprzedaż dozwolona" name="allow_land_resell_check"/> + <check_box label="Łączenie/Dzielenie dozwolone" name="allow_parcel_changes_check"/> + <check_box label="Zablokuj wyszukiwanie" name="block_parcel_search_check" tool_tip="Pozwól na wyświetlanie nazwy regionu i posiadłości w wynikach wyszukiwania"/> <spinner label="Limit Gości" name="agent_limit_spin"/> - <spinner label="Ekstra Obiekty" name="object_bonus_spin"/> - <text label="Ograniczenia Wieku" name="access_text"> + <spinner label="Ekstra obiekty" name="object_bonus_spin"/> + <text label="Ograniczenia wieku" name="access_text"> Rodzaj: </text> <icons_combo_box label="'Mature'" name="access_combo"> @@ -36,8 +36,8 @@ <icons_combo_box.item label="'PG'" name="PG" value="13"/> </icons_combo_box> <button label="Zastosuj" name="apply_btn"/> - <button label="Teleportuj do Miejsca Startu Jednego Rezydenta..." name="kick_btn"/> - <button label="Teleportuj do Miejsca Startu Wszystkich Rezydentów..." name="kick_all_btn"/> - <button label="Wyślij Wiadomość do Regionu..." name="im_btn"/> - <button label="Obsługa Teleportera..." name="manage_telehub_btn"/> + <button label="Teleportuj do Miejsca Startu jednego Rezydenta..." name="kick_btn"/> + <button label="Teleportuj do Miejsca Startu wszystkich Rezydentów..." name="kick_all_btn"/> + <button label="Wyślij wiadomość do Regionu..." name="im_btn"/> + <button label="Obsługa teleportera..." name="manage_telehub_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_region_general_layout.xml b/indra/newview/skins/default/xui/pl/panel_region_general_layout.xml index 6e53e8b7e4..ffa8f1e18a 100644 --- a/indra/newview/skins/default/xui/pl/panel_region_general_layout.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_general_layout.xml @@ -18,16 +18,16 @@ <text name="region_type"> nieznany </text> - <check_box label="Zablokuj Zmiany Terenu" name="block_terraform_check"/> - <check_box label="Zablokuj Latanie" name="block_fly_check"/> - <check_box label="Uszkodzenia Dozwolone" name="allow_damage_check"/> - <check_box label="Zablokuj Popychanie" name="restrict_pushobject"/> - <check_box label="Odsprzedaż Dozwolona" name="allow_land_resell_check"/> - <check_box label="Łączenie/Dzielenie Dozwolone" name="allow_parcel_changes_check"/> - <check_box label="Zablokuj Wyszukiwanie" name="block_parcel_search_check" tool_tip="Pozwól na wyświetlanie nazwy regionu i posiadłości w wynikach wyszukiwania"/> + <check_box label="Zablokuj zmiany terenu" name="block_terraform_check"/> + <check_box label="Zablokuj latanie" name="block_fly_check"/> + <check_box label="Uszkodzenia dozwolone" name="allow_damage_check"/> + <check_box label="Zablokuj popychanie" name="restrict_pushobject"/> + <check_box label="Odsprzedaż dozwolona" name="allow_land_resell_check"/> + <check_box label="Łączenie/Dzielenie dozwolone" name="allow_parcel_changes_check"/> + <check_box label="Zablokuj wyszukiwanie" name="block_parcel_search_check" tool_tip="Pozwól na wyświetlanie nazwy Regionu i Posiadłości w wynikach wyszukiwania"/> <spinner label="Limit Gości" name="agent_limit_spin"/> - <spinner label="Ekstra Obiekty" name="object_bonus_spin"/> - <text label="Restrykcje Wieku" name="access_text"> + <spinner label="Ekstra obiekty" name="object_bonus_spin"/> + <text label="Restrykcje wieku" name="access_text"> Rodzaj: </text> <combo_box label="Moderuj" name="access_combo"> @@ -36,8 +36,8 @@ <combo_box.item label="Ogólne" name="PG"/> </combo_box> <button label="Zastosuj" name="apply_btn"/> - <button label="Teleportuj do Miejsca Startu Jednego Rezydenta..." name="kick_btn"/> - <button label="Teleportuj do Miejsca Startu Wszystkich Rezydentów..." name="kick_all_btn"/> - <button label="Wyślij Wiadomość do Regionu..." name="im_btn"/> - <button label="Obsługa Teleportera..." name="manage_telehub_btn"/> + <button label="Teleportuj do Miejsca Startu jednego Rezydenta..." name="kick_btn"/> + <button label="Teleportuj do Miejsca Startu wszystkich Rezydentów..." name="kick_all_btn"/> + <button label="Wyślij wiadomość do Regionu..." name="im_btn"/> + <button label="Obsługa teleportera..." name="manage_telehub_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml index b206616e34..917ae91774 100644 --- a/indra/newview/skins/default/xui/pl/panel_region_terrain.xml +++ b/indra/newview/skins/default/xui/pl/panel_region_terrain.xml @@ -6,22 +6,22 @@ <text name="region_text"> brak danych </text> - <spinner label="Poziom Wody" name="water_height_spin" /> + <spinner label="Poziom wody" name="water_height_spin" /> <button label="?" name="water_height_help" /> - <spinner label="Górny Limit Terenu" name="terrain_raise_spin" /> + <spinner label="Górny limit terenu" name="terrain_raise_spin" /> <button label="?" name="terrain_raise_help" /> - <spinner label="Dolny Limit Terenu" name="terrain_lower_spin" /> + <spinner label="Dolny limit terenu" name="terrain_lower_spin" /> <button label="?" name="terrain_lower_help" /> <check_box label="Używaj Słońca Majątku" name="use_estate_sun_check" /> <button label="?" name="use_estate_sun_help" /> <check_box label="Stałe Słońce" name="fixed_sun_check" /> <button label="?" name="fixed_sun_help" /> - <slider label="Pora Doby" name="sun_hour_slider" /> + <slider label="Pora doby" name="sun_hour_slider" /> <button label="Zastosuj" name="apply_btn" /> - <button label="Zapisz Surowy Teren..." name="download_raw_btn" + <button label="Zapisz surowy teren..." name="download_raw_btn" tool_tip="Dostępne tylko dla Właścicieli Majątku, nie dla Zarządców" /> <button label="?" name="download_raw_help" /> - <button label="Załaduj Surowy Teren..." name="upload_raw_btn" + <button label="Załaduj surowy teren..." name="upload_raw_btn" tool_tip="Dostępne tylko dla Właścicieli Majątku, nie dla Zarządców" /> <button label="?" name="upload_raw_help" /> <button label="Ustal Teren" name="bake_terrain_btn" diff --git a/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml b/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml index 1841e1544e..e1863517a2 100644 --- a/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml +++ b/indra/newview/skins/default/xui/pl/panel_script_limits_my_avatar.xml @@ -12,5 +12,5 @@ <scroll_list.columns label="Nazwa Obiektu" name="name"/> <scroll_list.columns label="Lokalizacja" name="location"/> </scroll_list> - <button label="Odśwież Listę" name="refresh_list_btn"/> + <button label="Odśwież listę" name="refresh_list_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml b/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml index f1de73c84d..1419a9c9f6 100644 --- a/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml +++ b/indra/newview/skins/default/xui/pl/panel_script_limits_region_memory.xml @@ -14,7 +14,7 @@ <scroll_list.columns label="Parcela" name="parcel"/> <scroll_list.columns label="Lokalizacja" name="location"/> </scroll_list> - <button label="Odśwież Listę" name="refresh_list_btn"/> + <button label="Odśwież listę" name="refresh_list_btn"/> <button label="Pokaż" name="highlight_btn"/> <button label="Zwróć" name="return_btn"/> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml index e47a15b67a..0f99f3911c 100644 --- a/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml +++ b/indra/newview/skins/default/xui/pl/panel_stand_stop_flying.xml @@ -2,5 +2,5 @@ <!-- Width and height of this panel should be synchronized with "panel_modes" in the floater_moveview.xml--> <panel name="panel_stand_stop_flying"> <button label="Wstań" name="stand_btn" tool_tip="Kliknij tutaj by wstać."/> - <button label="Zatrzymaj Latanie" name="stop_fly_btn" tool_tip="Zatrzymaj Latanie"/> + <button label="Zatrzymaj latanie" name="stop_fly_btn" tool_tip="Zatrzymaj latanie"/> </panel> diff --git a/indra/newview/skins/default/xui/pl/panel_status_bar.xml b/indra/newview/skins/default/xui/pl/panel_status_bar.xml index 8e03d2a3b9..cd2ae14f6c 100644 --- a/indra/newview/skins/default/xui/pl/panel_status_bar.xml +++ b/indra/newview/skins/default/xui/pl/panel_status_bar.xml @@ -7,7 +7,7 @@ Styczeń:Luty:Marzec:Kwiecień:Maj:Czerwiec:Lipiec:Styczeń:Wrzesień:Październik:Listopad:Grudzień </panel.string> <panel.string name="packet_loss_tooltip"> - Utracone Pakiety + Utracone pakiety </panel.string> <panel.string name="bandwidth_tooltip"> Przepustowość diff --git a/indra/newview/skins/default/xui/pl/panel_world_map.xml b/indra/newview/skins/default/xui/pl/panel_world_map.xml index 70479fe209..849b01a1ce 100644 --- a/indra/newview/skins/default/xui/pl/panel_world_map.xml +++ b/indra/newview/skins/default/xui/pl/panel_world_map.xml @@ -4,7 +4,7 @@ Ładowanie... </panel.string> <panel.string name="InvalidLocation"> - Niewłaściwa Lokalizacja + Niewłaściwa lokalizacja </panel.string> <panel.string name="world_map_north"> N diff --git a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml index c986179377..3b038a7102 100644 --- a/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml +++ b/indra/newview/skins/default/xui/pl/sidepanel_item_info.xml @@ -54,7 +54,7 @@ </text> <check_box label="Udostępnij" name="CheckShareWithGroup" tool_tip="Pozwól wszystkim członkom ustawionej grupy na dzielenie prawa do modyfikacji dla tego obiektu. Musisz Przypisać aby aktywować ograniczenia wynikające z roli."/> <text name="NextOwnerLabel"> - Następny właściciel: + Następny Właściciel: </text> <check_box label="Modyfikuje" name="CheckNextOwnerModify"/> <check_box label="Kopiuje" name="CheckNextOwnerCopy"/> diff --git a/indra/newview/skins/default/xui/pl/strings.xml b/indra/newview/skins/default/xui/pl/strings.xml index f01dd9c475..c72f783a51 100644 --- a/indra/newview/skins/default/xui/pl/strings.xml +++ b/indra/newview/skins/default/xui/pl/strings.xml @@ -1902,25 +1902,25 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Cień o godzinie 5 </string> <string name="All White"> - Wszystko Białe + Wszystko białe </string> <string name="Anime Eyes"> - Animuj Oczy + Animuj oczy </string> <string name="Arced"> Obrócony </string> <string name="Arm Length"> - Długość Ramienia + Długość ramienia </string> <string name="Attached"> Dołączone </string> <string name="Attached Earlobes"> - Płatki Uszu Dołączone + Płatki uszu dołączone </string> <string name="Back Fringe"> - Tylnia Grzywka + Tylnia grzywka </string> <string name="Baggy"> Wypchane @@ -1941,13 +1941,13 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Duży Pośladek </string> <string name="Big Hair Back"> - Duże Włosy: z Tyłu + Duże Włosy: z tyłu </string> <string name="Big Hair Front"> - Duże Włosy: z Przodu + Duże Włosy: z przodu </string> <string name="Big Hair Top"> - Duże Włosy: z Góry + Duże Włosy: z góry </string> <string name="Big Head"> Duża Głowa @@ -1965,22 +1965,22 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Blond </string> <string name="Blonde Hair"> - Włosy Koloru Blond + Włosy Blond </string> <string name="Blush"> Rumieniec </string> <string name="Blush Color"> - Kolor Rumieńca + Kolor rumieńca </string> <string name="Blush Opacity"> - Intensywność Rumieńca + Intensywność rumieńca </string> <string name="Body Definition"> - Detale Ciała + Detale ciała </string> <string name="Body Fat"> - Zawartość Tkanki Tłuszczowej + Zawartość tkanki tłuszczowej </string> <string name="Body Freckles"> Piegi @@ -1998,13 +1998,13 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Bow Legged </string> <string name="Breast Buoyancy"> - Jędrność Piersi + Jędrność piersi </string> <string name="Breast Cleavage"> - Odstęp Między Piersiami + Odstęp między piersiami </string> <string name="Breast Size"> - Rozmiar Piersi + Rozmiar piersi </string> <string name="Bridge Width"> Szerokość @@ -2013,7 +2013,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Szerokie </string> <string name="Brow Size"> - Rozmiar Czoła + Rozmiar czoła </string> <string name="Bug Eyes"> Bug Eyes @@ -2049,34 +2049,34 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Chaplin </string> <string name="Cheek Bones"> - Kości Policzkowe + Kości policzkowe </string> <string name="Chest Size"> - Rozmiar Klatki Piersiowej + Rozmiar klatki piersiowej </string> <string name="Chin Angle"> - Kąt Podbródka + Kąt podbródka </string> <string name="Chin Cleft"> - Dołek w Podbródku + Dołek w podbródku </string> <string name="Chin Curtains"> - Zasłonięcie Podbródka + Zasłonięcie podbródka </string> <string name="Chin Depth"> - Długość Podbródka + Długość podbródka </string> <string name="Chin Heavy"> - Ciężar Podbródka + Ciężar podbródka </string> <string name="Chin In"> - Podbródek Wewnątrz + Podbródek wewnątrz </string> <string name="Chin Out"> - Podbródek Zewnętrzny + Podbródek zewnętrzny </string> <string name="Chin-Neck"> - Podwójny Podbródek + Podwójny podbródek </string> <string name="Clear"> Wyczyść @@ -2091,25 +2091,25 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Zamknięte </string> <string name="Closed Back"> - Zamknięte z Tyłu + Zamknięte z tyłu </string> <string name="Closed Front"> - Zamknięte z Przodu + Zamknięte z przodu </string> <string name="Closed Left"> - Lewe Oko Zamknięte + Lewe Oko zamknięte </string> <string name="Closed Right"> - Prawe Oko Zamknięte + Prawe Oko zamknięte </string> <string name="Coin Purse"> Coin Purse </string> <string name="Collar Back"> - Kołnierz z Tyłu + Kołnierz z tyłu </string> <string name="Collar Front"> - Kołnierz z Przodu + Kołnierz z przodu </string> <string name="Corner Down"> Corner Down @@ -2121,7 +2121,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Pognieciony </string> <string name="Crooked Nose"> - Skrzywienie Nosa + Skrzywienie nosa </string> <string name="Cuff Flare"> Cuff Flare @@ -2130,7 +2130,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Ciemne </string> <string name="Dark Green"> - Ciemne Zielone + Ciemne zielone </string> <string name="Darker"> Ciemniejsze @@ -2145,7 +2145,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Gęstość </string> <string name="Double Chin"> - Podwójny Podbródek + Podwójny podbródek </string> <string name="Downturned"> Downturned @@ -2154,58 +2154,58 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Duffle Bag </string> <string name="Ear Angle"> - Odstawanie Uszu + Odstawanie uszu </string> <string name="Ear Size"> - Rozmiar Uszu + Rozmiar uszu </string> <string name="Ear Tips"> - Wierzchołki Uszu + Wierzchołki uszu </string> <string name="Egg Head"> - Jajowata Głowa + Jajowata głowa </string> <string name="Eye Bags"> - Woreczek Łzowy + Woreczek łzowy </string> <string name="Eye Color"> - Kolor Oczu + Kolor oczu </string> <string name="Eye Depth"> - Głębokość Osadzenia Oczu + Głębokość osadzenia oczu </string> <string name="Eye Lightness"> - Ustawienie Jasności Oczu + Ustawienie jasności oczu </string> <string name="Eye Opening"> - Oczy Otwarte + Oczy otwarte </string> <string name="Eye Pop"> - Różnica w Wielkości Oczu + Różnica w wielkości oczu </string> <string name="Eye Size"> - Rozmiar Oczu + Rozmiar oczu </string> <string name="Eye Spacing"> - Rozstaw Oczu + Rozstaw oczu </string> <string name="Eyebrow Arc"> - Łuk Brwiowy + Łuk brwiowy </string> <string name="Eyebrow Density"> - Gęstość Brwi + Gęstość brwi </string> <string name="Eyebrow Height"> - Wysokość Brwi + Wysokość brwi </string> <string name="Eyebrow Points"> - Kształt Brwi + Kształt brwi </string> <string name="Eyebrow Size"> - Rozmiar Brwi + Rozmiar brwi </string> <string name="Eyelash Length"> - Długość Rzęs + Długość rzęs </string> <string name="Eyeliner"> Eyeliner @@ -2217,16 +2217,16 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Eyes Bugged </string> <string name="Face Shear"> - Usunięcie Twarzy + Usunięcie twarzy </string> <string name="Facial Definition"> - Detale Twarzy + Detale twarzy </string> <string name="Far Set Eyes"> Far Set Eyes </string> <string name="Fat Lips"> - Grube Usta + Grube usta </string> <string name="Female"> Kobieta @@ -2238,28 +2238,28 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Palce </string> <string name="Flared Cuffs"> - Flared Cuffs + Rozszerzane rękawy </string> <string name="Flat"> Płaskość </string> <string name="Flat Butt"> - Płaskie Pośladki + Płaskie pośladki </string> <string name="Flat Head"> - Płaska Głowa + Płaska głowa </string> <string name="Flat Toe"> - Płaski Palec + Płaski palec </string> <string name="Foot Size"> - Rozmiar Stopy + Rozmiar stopy </string> <string name="Forehead Angle"> - Kształt Czoła + Kształt czoła </string> <string name="Forehead Heavy"> - Ciężar Czoła + Ciężar czoła </string> <string name="Freckles"> Piegi @@ -2268,19 +2268,19 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Przednia Grzywka </string> <string name="Full Back"> - Gęstość Włosów po Bokach + Gęstość włosów po bokach </string> <string name="Full Eyeliner"> - Gęsty Eyeliner + Gęsta kredka do oczu </string> <string name="Full Front"> - Gęsty Przód + Gęsty przód </string> <string name="Full Hair Sides"> - Gęste Włosy po Bokach + Gęste włosy po bokach </string> <string name="Full Sides"> - Gęste Boki + Gęste boki </string> <string name="Glossy"> Błyszczące @@ -2289,64 +2289,64 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Rękawiczki </string> <string name="Glove Length"> - Długość Rękawiczek + Długość rękawiczek </string> <string name="Hair"> Włosy </string> <string name="Hair Back"> - Włosy: z Tyłu + Włosy: z tyłu </string> <string name="Hair Front"> - Włosy: z Przodu + Włosy: z przodu </string> <string name="Hair Sides"> - Hair: Boki + Włosy: boki </string> <string name="Hair Sweep"> - Kierunek Zaczesania + Kierunek zaczesania </string> <string name="Hair Thickess"> - Grubość Włosów + Grubość włosów </string> <string name="Hair Thickness"> - Grubość Włosów + Grubość włosów </string> <string name="Hair Tilt"> - Przesunięcie Fryzury + Przes. fryzury </string> <string name="Hair Tilted Left"> - Przesunięcie Fryzury w Lewo + Przes. fryzury L </string> <string name="Hair Tilted Right"> - Przesunięcie Fryzury w Prawo + Przes. fryzury P </string> <string name="Hair Volume"> - Włosy: Objętość + Włosy: objętość </string> <string name="Hand Size"> - Rozmiar Dłoni + Rozmiar dłoni </string> <string name="Handlebars"> Handlebars </string> <string name="Head Length"> - Długość Głowy + Długość głowy </string> <string name="Head Shape"> - Kształt Głowy + Kształt głowy </string> <string name="Head Size"> - Rozmiar Głowy + Rozmiar głowy </string> <string name="Head Stretch"> - Rozciągnięcie Głowy + Rozciągnięcie głowy </string> <string name="Heel Height"> - Wysokość Obcasa + Wysokość obcasa </string> <string name="Heel Shape"> - Ksztalt Obcasa + Ksztalt obcasa </string> <string name="Height"> Wysokość @@ -2355,7 +2355,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Wysoka </string> <string name="High Heels"> - Wysokie Obcasy + Wysokie obcasy </string> <string name="High Jaw"> High Jaw @@ -2370,34 +2370,34 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Wyżej </string> <string name="Hip Length"> - Długość Bioder + Długość bioder </string> <string name="Hip Width"> - Szerokość Bioder + Szerokość bioder </string> <string name="In"> W </string> <string name="In Shdw Color"> - Wewnętrzny Kolor Cienia + Wewnętrzny kolor cienia </string> <string name="In Shdw Opacity"> - Wewnętrzna Intensywność Cienia + Wewnętrzna intensywność cienia </string> <string name="Inner Eye Corner"> - Wenwętrzny Bok Oka + Wenwętrzny bok oka </string> <string name="Inner Eye Shadow"> - Wewnętrzny Cień Oka + Wewnętrzny cień oka </string> <string name="Inner Shadow"> - Wewnętrzny Cień + Wewnętrzny cień </string> <string name="Jacket Length"> - Długość Kurtki + Długość kurtki </string> <string name="Jacket Wrinkles"> - Zmarszczki na Kurtce + Zmarszczki na kurtce </string> <string name="Jaw Angle"> Jaw Angle @@ -2415,7 +2415,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Jowls </string> <string name="Knee Angle"> - Kąt Kolana + Kąt kolana </string> <string name="Knock Kneed"> Knock Kneed @@ -2424,22 +2424,22 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Duże </string> <string name="Large Hands"> - Duże Dłonie + Duże dłonie </string> <string name="Left Part"> Left Part </string> <string name="Leg Length"> - Długość Nogi + Długość nogi </string> <string name="Leg Muscles"> - Umięśnione Nogi + Umięśnione nogi </string> <string name="Less"> Mniej </string> <string name="Less Body Fat"> - Mniejsza Zawartości Tkanki Tłuszczowej + Mniejsza zawartości tkanki tłuszczowej </string> <string name="Less Curtains"> Less Curtains @@ -2448,7 +2448,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Mniej Piegów </string> <string name="Less Full"> - Less Full + Mniej Pełne </string> <string name="Less Gravity"> Mniej Ciężaru @@ -2457,25 +2457,25 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Less Love </string> <string name="Less Muscles"> - Mniej Mięśni + Mniej mięśni </string> <string name="Less Muscular"> - Mniej Umięśnienia + Mniej umięśnienia </string> <string name="Less Rosy"> Less Rosy </string> <string name="Less Round"> - Mniej Zaaokrąglone + Mniej zaaokrąglone </string> <string name="Less Saddle"> Less Saddle </string> <string name="Less Square"> - Mniej Kwadratowe + Mniej kwadratowe </string> <string name="Less Volume"> - Mniej Objętości + Mniej objętości </string> <string name="Less soul"> Less soul @@ -2484,25 +2484,25 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Lżejsze </string> <string name="Lip Cleft"> - Szerokość Rozszczepienia Górnej Wargi + Szerokość Rozszczepienia górnej wargi </string> <string name="Lip Cleft Depth"> - Głębokość Rozszczepienia Górnej Wargi + Głębokość rozszczepienia górnej wargi </string> <string name="Lip Fullness"> - Pełność Ust + Pełne usta </string> <string name="Lip Pinkness"> - Róż Ust + Róż ust </string> <string name="Lip Ratio"> - Proporcje Ust + Proporcje ust </string> <string name="Lip Thickness"> - Grubość Ust + Grubość ust </string> <string name="Lip Width"> - Szerokość Ust + Szerokość ust </string> <string name="Lipgloss"> Połysk @@ -2511,43 +2511,43 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Szminka </string> <string name="Lipstick Color"> - Kolor Szminki + Kolor szminki </string> <string name="Long"> Dlugość </string> <string name="Long Head"> - Długa Głowa + Długa głowa </string> <string name="Long Hips"> - Długie Biodra + Długie biodra </string> <string name="Long Legs"> - Długie Nogi + Długie nogi </string> <string name="Long Neck"> - Długi Kark + Długi kark </string> <string name="Long Pigtails"> - Długi Warkocz + Długi warkocz </string> <string name="Long Ponytail"> - Długi Kucyk + Długi kucyk </string> <string name="Long Torso"> - Długi Tułów + Długi tułów </string> <string name="Long arms"> - Dlugie Ramiona + Dlugie ramiona </string> <string name="Loose Pants"> - Luźne Spodnie + Luźne spodnie </string> <string name="Loose Shirt"> - Luźna Koszulka + Luźna koszulka </string> <string name="Loose Sleeves"> - Luźne Rękawy + Luźne rękawy </string> <string name="Love Handles"> Love Handles @@ -2556,16 +2556,16 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Nisko </string> <string name="Low Heels"> - Niskie Obcasy + Niskie obcasy </string> <string name="Low Jaw"> - Niska Szczęka + Niska szczęka </string> <string name="Low Platforms"> Low Platforms </string> <string name="Low and Loose"> - Niskie i Luźne + Niskie i luźne </string> <string name="Lower"> Niżej @@ -2580,7 +2580,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Mężczyzna </string> <string name="Middle Part"> - Część Środkowa + Część środkowa </string> <string name="More"> Więcej @@ -2589,7 +2589,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. More Blush </string> <string name="More Body Fat"> - Więcej Zawartości Tkanki Tłuszczowej + Więcej zawartości tkanki tłuszczowej </string> <string name="More Curtains"> More Curtains @@ -2598,34 +2598,34 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. More Eyeshadow </string> <string name="More Freckles"> - Więcej Piegów + Więcej piegów </string> <string name="More Full"> More Full </string> <string name="More Gravity"> - Więcej Ciężaru + Więcej ciężaru </string> <string name="More Lipstick"> - Więcej Szminki + Więcej szminki </string> <string name="More Love"> More Love </string> <string name="More Lower Lip"> - Więcej Dolnej Wargi + Więcej dolnej wargi </string> <string name="More Muscles"> - Więcej Mięśni + Więcej mięśni </string> <string name="More Muscular"> - Więcej Umięśnienia + Więcej umięśnienia </string> <string name="More Rosy"> More Rosy </string> <string name="More Round"> - Więcej Zaokrąglenia + Więcej zaokrąglenia </string> <string name="More Saddle"> More Saddle @@ -2634,16 +2634,16 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. More Sloped </string> <string name="More Square"> - Więcej Kwadratowy + Więcej kwadratowy </string> <string name="More Upper Lip"> - Więcej Górnej Wargi + Więcej górnej wargi </string> <string name="More Vertical"> More Vertical </string> <string name="More Volume"> - Więcej Objętości + Więcej objętości </string> <string name="More soul"> More soul @@ -2667,10 +2667,10 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Mutton Chops </string> <string name="Nail Polish"> - Lakier na Paznokciach + Lakier na paznokciach </string> <string name="Nail Polish Color"> - Kolor Lakieru na Paznokciach + Kolor lakieru na paznokciach </string> <string name="Narrow"> Wąskie @@ -2688,10 +2688,10 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Naturalne </string> <string name="Neck Length"> - Długość Karku + Długość karku </string> <string name="Neck Thickness"> - Grubość Karku + Grubość karku </string> <string name="No Blush"> No Blush @@ -2700,64 +2700,64 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Brak Eyeliner's </string> <string name="No Eyeshadow"> - Brak Cienia pod Powieką + Brak cienia pod powieką </string> <string name="No Lipgloss"> - Brak Połysku + Brak połysku </string> <string name="No Lipstick"> - Brak Szminki + Brak szminki </string> <string name="No Part"> No Part </string> <string name="No Polish"> - Brak Lakieru + Brak lakieru </string> <string name="No Red"> - Brak Czerwieni + Brak czerwieni </string> <string name="No Spikes"> - Brak Szpiców + Brak szpiców </string> <string name="No White"> - Brak Białego + Brak białego </string> <string name="No Wrinkles"> - Brak Zmarszczek + Brak zmarszczek </string> <string name="Normal Lower"> - Dół Normalny + Dół normalny </string> <string name="Normal Upper"> - Góra Normalna + Góra normalna </string> <string name="Nose Left"> - Nos w Stronę Lewą + Nos w stronę lewą </string> <string name="Nose Right"> - Nos w Stronę Prawą + Nos w stronę prawą </string> <string name="Nose Size"> - Rozmiar Nosa + Rozmiar nosa </string> <string name="Nose Thickness"> - Grubość Nosa + Grubość nosa </string> <string name="Nose Tip Angle"> - Kąt Czubka Nosa + Kąt czubka nosa </string> <string name="Nose Tip Shape"> - Kształt Czubka Nosa + Kształt czubka nosa </string> <string name="Nose Width"> - Szerokość Nosa + Szerokość nosa </string> <string name="Nostril Division"> - Przegroda Nosa + Przegroda nosa </string> <string name="Nostril Width"> - Wielkość Dziurek w Nosie + Wielkość dziurek w nosie </string> <string name="Opaque"> Intensywność @@ -2766,16 +2766,16 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Otwarte </string> <string name="Open Back"> - Otwarte z Tyłu + Otwarte z tyłu </string> <string name="Open Front"> - Otwarte z Przodu + Otwarte z przodu </string> <string name="Open Left"> - Otwarte z Lewej + Otwarte z lewej </string> <string name="Open Right"> - Otwarte z Prawej + Otwarte z prawej </string> <string name="Orange"> Pomarańczowe @@ -2784,19 +2784,19 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Zewnętrznie </string> <string name="Out Shdw Color"> - Zewnętrzny Kolor Cienia + Zewnętrzny kolor cienia </string> <string name="Out Shdw Opacity"> - Zewnętrzna Grubość Cienia + Zewnętrzna grubość cienia </string> <string name="Outer Eye Corner"> - Zewnętrzny Bok Oka + Zewnętrzny bok oka </string> <string name="Outer Eye Shadow"> - Zewnętrzny Cień Oka + Zewnętrzny cień oka </string> <string name="Outer Shadow"> - Zewnętrzny Cień + Zewnętrzny cień </string> <string name="Overbite"> Overbite @@ -2805,25 +2805,25 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Package </string> <string name="Painted Nails"> - Pomalowane Paznokcie + Pomalowane paznokcie </string> <string name="Pale"> Pale </string> <string name="Pants Crotch"> - Krocze Spodni + Krocze spodni </string> <string name="Pants Fit"> Pants Fit </string> <string name="Pants Length"> - Długość Spodni + Długość spodni </string> <string name="Pants Waist"> - Talia Spodni + Talia spodni </string> <string name="Pants Wrinkles"> - Zmarszczki Spodni + Zmarszczki spodni </string> <string name="Part"> Część @@ -2832,7 +2832,7 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Part Bangs </string> <string name="Pectorals"> - Mięśnie Klatki Piersiowej + Mięśnie klatki piersiowej </string> <string name="Pigment"> Pigment @@ -2886,10 +2886,10 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Regularne </string> <string name="Right Part"> - Prawa Cześć + Prawa część </string> <string name="Rosy Complexion"> - Kompleksowość Różu + Kompleksowość różu </string> <string name="Round"> Zaokrąglenie @@ -2916,34 +2916,34 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Płytkie </string> <string name="Shear Back"> - Tylne Usunięcie Włosów + Tylne usunięcie włosów </string> <string name="Shear Face"> - Usunięcie Twarzy + Usunięcie twarzy </string> <string name="Shear Front"> - Przednie Usunięcie Włosów + Przednie usunięcie włosów </string> <string name="Shear Left Up"> - Usunięcie od Lewej Strony do Góry + Usunięcie od lewej strony do góry </string> <string name="Shear Right Up"> - Usunięcie od Prawej Strony do Góry + Usunięcie od prawej strony do góry </string> <string name="Sheared Back"> - Tylnie Usunięcie Włosów + Tylnie usunięcie włosów </string> <string name="Sheared Front"> - Przednie Usunięcie Włosów + Przednie usunięcie włosów </string> <string name="Shift Left"> - Przesuń w Lewo + Przesuń w lewo </string> <string name="Shift Mouth"> - Przesuń Usta + Przesuń usta </string> <string name="Shift Right"> - Przesuń w Prawo + Przesuń w prawo </string> <string name="Shirt Bottom"> Dolna Część Koszulki @@ -2952,22 +2952,22 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Shirt Fit </string> <string name="Shirt Wrinkles"> - Zmarszczki na Koszulce + Zmarszczki na koszulce </string> <string name="Shoe Height"> - Wysokość Buta + Wysokość buta </string> <string name="Short"> Krótkie </string> <string name="Short Arms"> - Krótkie Ramiona + Krótkie ramiona </string> <string name="Short Legs"> - Krótkie Nogi + Krótkie nogi </string> <string name="Short Neck"> - Krótki Kark + Krótki kark </string> <string name="Short Pigtails"> Short Pigtails @@ -2979,16 +2979,16 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Krótkie Baczki </string> <string name="Short Torso"> - Krótki Tułów + Krótki tułów </string> <string name="Short hips"> - Krótkie Biodra + Krótkie biodra </string> <string name="Shoulders"> Ramiona </string> <string name="Side Fringe"> - Boczna Grzywka + Boczna grzywka </string> <string name="Sideburns"> Baczki @@ -3009,16 +3009,16 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Skirt Fit </string> <string name="Skirt Length"> - Długość Spódnicy + Długość spódnicy </string> <string name="Slanted Forehead"> - Ukośne Czoło + Ukośne czoło </string> <string name="Sleeve Length"> - Długość Rękawów + Długość rękawów </string> <string name="Sleeve Looseness"> - Luźność Rękawów + Luźność rękawów </string> <string name="Slit Back"> Slit: Back @@ -3036,19 +3036,19 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Małe </string> <string name="Small Hands"> - Małe Dłonie + Małe dłonie </string> <string name="Small Head"> - Mała Głowa + Mała głowa </string> <string name="Smooth"> Gładkie </string> <string name="Smooth Hair"> - Gładkie Włosy + Gładkie włosy </string> <string name="Socks Length"> - Długość Skarpetek + Długość skarpetek </string> <string name="Soulpatch"> Soulpatch @@ -3063,13 +3063,13 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Kwadratowe </string> <string name="Square Toe"> - Kwadratowy Palec + Kwadratowy palec </string> <string name="Squash Head"> - Ściśnięta Głowa + Ściśnięta głowa </string> <string name="Stretch Head"> - Rozciągnięta Głowa + Rozciągnięta głowa </string> <string name="Sunken"> Sunken @@ -3096,58 +3096,58 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Taper Front </string> <string name="Thick Heels"> - Grube Obcasy + Grube obcasy </string> <string name="Thick Neck"> - Gruby Kark + Gruby kark </string> <string name="Thick Toe"> - Gruby Palec + Gruby palec </string> <string name="Thin"> Wąski </string> <string name="Thin Eyebrows"> - Wąskie Brwi + Wąskie brwi </string> <string name="Thin Lips"> - Wąskie Usta + Wąskie usta </string> <string name="Thin Nose"> - Wąski Nos + Wąski nos </string> <string name="Tight Chin"> - Obcisły Podbródek + Obcisły podbródek </string> <string name="Tight Cuffs"> - Obcisłe Rękawy + Obcisłe rękawy </string> <string name="Tight Pants"> - Obciesłe Spodnie + Obciesłe spodnie </string> <string name="Tight Shirt"> - Obcisły Podkoszulek + Obcisły podkoszulek </string> <string name="Tight Skirt"> - Tight Skirt + Wąska spódnica </string> <string name="Tight Sleeves"> - Obcisłe Rękawy + Obcisłe rękawy </string> <string name="Toe Shape"> - Kształt Palca + Kształt palca </string> <string name="Toe Thickness"> - Grubość Palca + Grubość palca </string> <string name="Torso Length"> - Długość Tułowia + Długość tułowia </string> <string name="Torso Muscles"> - Mięśnie Tułowia + Mięśnie tułowia </string> <string name="Torso Scrawny"> - Wychudzony Tułów + Wychudzony tułów </string> <string name="Unattached"> Nieprzyłączone @@ -3162,43 +3162,43 @@ Jeżeli nadal otrzymujesz ten komunikat, skontaktuj się z [SUPPORT_SITE]. Nienaturalne </string> <string name="Upper Bridge"> - Górny Mostek + Górny mostek </string> <string name="Upper Cheeks"> - Górne Policzki + Górne policzki </string> <string name="Upper Chin Cleft"> - Roszczepienie Górnego Podbródka + Roszczepienie górnego podbródka </string> <string name="Upper Eyelid Fold"> - Górna Powieka + Górna powieka </string> <string name="Upturned"> Zadarta </string> <string name="Very Red"> - Bardzo Czerwona + Bardzo czerwona </string> <string name="Waist Height"> - Wysokość Tali + Wysokość talii </string> <string name="Well-Fed"> Well-Fed </string> <string name="White Hair"> - Białe Włosy + Białe włosy </string> <string name="Wide"> Szerokie </string> <string name="Wide Back"> - Szeroki Tył + Szeroki tył </string> <string name="Wide Front"> - Szeroki Przód + Szeroki przód </string> <string name="Wide Lips"> - Szerokie Usta + Szerokie usta </string> <string name="Wild"> Dzikość diff --git a/indra/newview/skins/default/xui/pt/floater_about.xml b/indra/newview/skins/default/xui/pt/floater_about.xml index 39548dc497..f1f6ff9aea 100644 --- a/indra/newview/skins/default/xui/pt/floater_about.xml +++ b/indra/newview/skins/default/xui/pt/floater_about.xml @@ -38,7 +38,7 @@ Versão Vivox: [VIVOX_VERSION] </floater.string> <tab_container name="about_tab"> <panel label="Info" name="support_panel"> - <button label="Copiar para área de transferência" name="copy_btn"/> + <button label="Copiar" name="copy_btn"/> </panel> <panel label="Créditos" name="credits_panel"> <text_editor name="credits_editor"> diff --git a/indra/newview/skins/default/xui/pt/floater_about_land.xml b/indra/newview/skins/default/xui/pt/floater_about_land.xml index 885221997a..252969609a 100644 --- a/indra/newview/skins/default/xui/pt/floater_about_land.xml +++ b/indra/newview/skins/default/xui/pt/floater_about_land.xml @@ -118,7 +118,7 @@ Vá para o menu Mundo > Sobre a Terra ou selecione outro lote para mostrar se </text> <button label="Cancelar venda do terreno" label_selected="Cancelar venda do terreno" left="275" name="Cancel Land Sale" width="165"/> <text name="Claimed:"> - Reclamado: + Posse em: </text> <text name="DateClaimText"> Ter Ago 15 13:47:25 2006 @@ -135,28 +135,28 @@ Vá para o menu Mundo > Sobre a Terra ou selecione outro lote para mostrar se <text name="DwellText"> 0 </text> - <button label="Comprar Terra..." label_selected="Comprar Terra..." left="130" name="Buy Land..." width="125"/> + <button label="Comprar terreno..." label_selected="Comprar terreno..." left="130" name="Buy Land..." width="125"/> <button label="Dados do script" name="Scripts..."/> <button label="Comprar para o Grupo" name="Buy For Group..."/> - <button label="Comprar Passe..." label_selected="Comprar Passe..." left="130" name="Buy Pass..." tool_tip="Um passe concede a você acesso temporário a esta terra." width="125"/> - <button label="Abandonar Terra.." label_selected="Abandonar Terra.." name="Abandon Land..."/> - <button label="Reclamar Terra" name="Reclaim Land..."/> - <button label="Venda Linden" name="Linden Sale..." tool_tip="A terra precisa ser possuída, estar com o conteúdo configurado e não estar pronta para leilão."/> + <button label="Comprar passe..." label_selected="Comprar passe..." left="130" name="Buy Pass..." tool_tip="Um passe concede a você acesso temporário a este terreno." width="125"/> + <button label="Abandonar terreno..." label_selected="Abandonar terreno..." name="Abandon Land..."/> + <button label="Pedir terreno" name="Reclaim Land..."/> + <button label="Venda Linden" name="Linden Sale..." tool_tip="O terreno precisa ser possuído, estar com o conteúdo configurado e não estar pronto para leilão."/> </panel> <panel label="CONTRATO" name="land_covenant_panel"> <panel.string name="can_resell"> - Terra comprada nesta região pode ser revendida. + Terrenos comprados nesta região podem ser revendidos. </panel.string> <panel.string name="can_not_resell"> - Terra comprada nesta região não pode ser revendida. + Terrenos comprados nesta região não podem ser revendidos. </panel.string> <panel.string name="can_change"> - Terra comprada nesta região pode ser compartilhada -ou sub-dividida. + Terrenos comprados nesta região podem ser compartilhados +ou sub-divididos. </panel.string> <panel.string name="can_not_change"> - Terra comprada nesta região não pode ser compartilhada -ou sub-dividida. + Terrenos comprados nesta região não podem ser compartilhados +ou sub-divididos. </panel.string> <text name="estate_section_lbl"> Propriedade: @@ -215,7 +215,7 @@ ou sub-dividida. [COUNT] de [MAX] ([DELETED] serão deletados) </panel.string> <text name="parcel_object_bonus"> - Fator de Bonus para Objetos na Região: [BONUS] + Fator de bônus para objetos na região: [BONUS] </text> <text name="Simulator primitive usage:"> Uso de prims: @@ -224,13 +224,13 @@ ou sub-dividida. [COUNT] de [MAX] ([AVAILABLE] disponíveis) </text> <text name="Primitives parcel supports:" width="200"> - Primitivas suportadas pelo lote: + Prims suportadas pelo lote: </text> <text left="214" name="object_contrib_text" width="152"> [COUNT] </text> <text name="Primitives on parcel:"> - Primitivas no Lote: + Prims no Lote: </text> <text left="214" name="total_objects_text" width="48"> [COUNT] @@ -252,7 +252,7 @@ ou sub-dividida. <button label="Mostrar" label_selected="Mostrar" name="ShowGroup" right="-135" width="60"/> <button label="Retornar" name="ReturnGroup..." right="-10" tool_tip="Retornar os objetos para seus donos." width="119"/> <text left="14" name="Owned by others:" width="128"> - Propriedade de Outros: + Propriedade de outros: </text> <text left="214" name="other_objects_text" width="48"> [COUNT] @@ -266,13 +266,13 @@ ou sub-dividida. [COUNT] </text> <text left="4" name="Autoreturn" width="412"> - Devolver objetos de outros residentes automaticamente (digite 0 para desligar) + Devolver objetos de outros residentes (p/ desligar tecle 0) </text> <line_editor name="clean other time" right="-10"/> <text name="Object Owners:"> - Donos dos Objetos: + Donos dos objetos: </text> - <button label="Atualizar Lista" label_selected="Atualizar Lista" left="118" name="Refresh List" tool_tip="Refresh Object List"/> + <button label="Atualizar lista" label_selected="Atualizar lista" left="118" name="Refresh List" tool_tip="Refresh Object List"/> <button label="Retornar objetos..." label_selected="Retornar objetos..." left="230" name="Return objects..."/> <name_list name="owner list"> <name_list.columns label="Tipo" name="type"/> @@ -293,25 +293,25 @@ Apenas lotes maiores podem ser listados na busca. Esta opção está desabilitada porque você não pode modificar as opções deste lote. </panel.string> <panel.string name="mature_check_mature"> - Conteúdo Mature + Conteúdo Adulto </panel.string> <panel.string name="mature_check_adult"> - Conteúdo Adult + Conteúdo Adulto </panel.string> <panel.string name="mature_check_mature_tooltip"> - A informação do seu lote ou seu conteúdo são considerados mature. + A informação do seu lote ou seu conteúdo são considerados adulto. </panel.string> <panel.string name="mature_check_adult_tooltip"> - A informação do seu lote ou seu conteúdo são considerados adult. + A informação do seu lote ou seu conteúdo são considerados adulto. </panel.string> <panel.string name="landing_point_none"> (nenhum) </panel.string> <panel.string name="push_restrict_text"> - Sem Empurrar + Sem empurrar </panel.string> <panel.string name="push_restrict_region_text"> - Sem Empurrar (Imposição na Região) + Sem empurrar (imposição na região) </panel.string> <text name="allow_label"> Autorizar outros residentes a: @@ -319,31 +319,31 @@ Apenas lotes maiores podem ser listados na busca. <check_box label="Editar Terreno" name="edit land check" tool_tip="Se ativado, qualquer um pode modificar a forma da sua terra. É melhor deixar esta opção desativada, uma vez que você sempre pode editar seu próprio terreno."/> <check_box label="Voar" name="check fly" tool_tip="Se ativado, os Residentes podem voar na sua terra. Se desativado, eles podem voar apenas para dentro e por cima de sua terra."/> <text name="allow_label2"> - Criar Objetos: + Criar objetos: </text> <check_box label="Residentes" name="edit objects check"/> <check_box label="Grupo" name="edit group objects check"/> <text name="allow_label3"> - Entrada do Objeto: + Entrada do objeto: </text> <check_box label="Residentes" name="all object entry check"/> <check_box label="Grupo" name="group object entry check"/> <text name="allow_label4"> - Executar Scripts: + Executar scripts: </text> <check_box label="Residentes" name="check other scripts"/> <check_box label="Grupo" name="check group scripts"/> <text name="land_options_label"> - Opções de Terra: + Opções de terra: </text> <check_box label="Salvo (sem dano)" name="check safe" tool_tip="Se ativado, ajusta o terreno para Seguro, desabilitando combate com danos. Se não ativado, o combate com danos é habilitado."/> <check_box label="Sem Empurrar" name="PushRestrictCheck" tool_tip="Evita scripts que empurram. A ativação dessa opção pode ser útil para prevenir comportamentos desordeiros na sua terra."/> <check_box label="Mostrar terreno nos resultados de busca (L$30/semana)" name="ShowDirectoryCheck" tool_tip="Permitir que as pessoas vejam este terreno nos resultados de busca"/> <combo_box left="265" name="land category with adult" width="155"> - <combo_box.item label="Qualquer Categoria" name="item0"/> + <combo_box.item label="Qualquer categoria" name="item0"/> <combo_box.item label="Locação Linden" name="item1"/> - <combo_box.item label="Adult" name="item2"/> - <combo_box.item label="Artes e Cultura" name="item3"/> + <combo_box.item label="Adulto" name="item2"/> + <combo_box.item label="Artes e cultura" name="item3"/> <combo_box.item label="Negócios" name="item4"/> <combo_box.item label="Educacional" name="item5"/> <combo_box.item label="Jogos" name="item6"/> @@ -355,9 +355,9 @@ Apenas lotes maiores podem ser listados na busca. <combo_box.item label="Outros" name="item12"/> </combo_box> <combo_box left="265" name="land category" width="155"> - <combo_box.item label="Qualquer Categoria" name="item0"/> + <combo_box.item label="Qualquer categoria" name="item0"/> <combo_box.item label="Locação Linden" name="item1"/> - <combo_box.item label="Artes e Cultura" name="item3"/> + <combo_box.item label="Artes e cultura" name="item3"/> <combo_box.item label="Negócios" name="item4"/> <combo_box.item label="Educacional" name="item5"/> <combo_box.item label="Jogos" name="item6"/> @@ -368,7 +368,7 @@ Apenas lotes maiores podem ser listados na busca. <combo_box.item label="Compras" name="item11"/> <combo_box.item label="Outros" name="item12"/> </combo_box> - <check_box label="Conteúdo Mature" name="MatureCheck" tool_tip=""/> + <check_box label="Conteúdo adulto" name="MatureCheck" tool_tip=""/> <text name="Snapshot:"> Foto: </text> @@ -379,11 +379,11 @@ Apenas lotes maiores podem ser listados na busca. <button label="Definir" label_selected="Definir" name="Set" tool_tip="Define o ponto de aterrissagem aonde o visitante chega. Define para o ponto em que seu avatar se encontra neste lote."/> <button label="Limpar" label_selected="Limpar" name="Clear" tool_tip="Limpar o ponto de aterrissagem."/> <text name="Teleport Routing: "> - Rota de Tele-transporte: + Rota de Teletransporte: </text> - <combo_box left="140" name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os tele-transportes no seu lote." width="160"> + <combo_box left="140" name="landing type" tool_tip="Rota de Teletransporte -- Selecione como tratar os teletransportes no seu lote." width="160"> <combo_box.item label="Bloqueado" name="Blocked"/> - <combo_box.item label="Ponto de Aterrissagem" name="LandingPoint"/> + <combo_box.item label="Ponto de aterrissagem" name="LandingPoint"/> <combo_box.item label="Qualquer lugar" name="Anywhere"/> </combo_box> </panel> @@ -396,8 +396,8 @@ Apenas lotes maiores podem ser listados na busca. Página web: </text> <line_editor left="97" name="media_url"/> - <button label="Definir" name="set_media_url"/> - <check_box label="Esconder a URL da Mídia" left="97" name="hide_media_url" tool_tip="Ativando esta opção, a URL da mídia se ocultará para quaisquer visualizadores não autorizados a ver esta informação do lote. Notar que isto não está disponível para tipos HTML."/> + <button label="Definir..." label_selected="Definir..." name="set_media_url"/> + <check_box label="Esconder a URL da mídia" left="97" name="hide_media_url" tool_tip="Ativando esta opção, a URL da mídia se ocultará para quaisquer visualizadores não autorizados a ver esta informação do lote. Notar que isto não está disponível para tipos HTML."/> <text name="Description:"> Descrição: </text> @@ -442,22 +442,22 @@ Mídia: Uma ou mais destas opções está definida no nível de propriedade. </panel.string> <text name="Limit access to this parcel to:"> - Acesso a Este Lote + Acesso a este lote </text> <check_box label="Acesso para público categoria [MATURITY]" name="public_access"/> <text name="Only Allow"> Restringir acesso a contas confirmardas por: </text> <check_box label="Dados de pagamento fornecidos [ESTATE_PAYMENT_LIMIT]" name="limit_payment" tool_tip="Banir residentes sem identificação."/> - <check_box label="Idade confirmada: [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Banir residentes que não comprovaram a idade. Consulte o [SUPPORT_SITE] para saber mais."/> - <check_box label="Permitir Acesso do Grupo: [GROUP]" name="GroupCheck" tool_tip="Definir grupo na aba Geral."/> + <check_box label="Idade comprovada: [ESTATE_AGE_LIMIT]" name="limit_age_verified" tool_tip="Banir residentes que não comprovaram a idade. Consulte o [SUPPORT_SITE] para saber mais."/> + <check_box label="Permitir acesso do grupo: [GROUP]" name="GroupCheck" tool_tip="Definir grupo na aba Geral."/> <check_box label="Vender passes para:" name="PassCheck" tool_tip="Permite acesso temporário a este terreno"/> <combo_box name="pass_combo"> <combo_box.item label="Qualquer um" name="Anyone"/> <combo_box.item label="Grupo" name="Group"/> </combo_box> <spinner label="Preço em L$:" name="PriceSpin"/> - <spinner label="Horas de Acesso:" name="HoursSpin"/> + <spinner label="Horas de acesso:" name="HoursSpin"/> <panel name="Allowed_layout_panel"> <name_list name="AccessList" tool_tip="(Total [LISTED], máx de [MAX])"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml b/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml index 9f34111d8a..8823d04b62 100644 --- a/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml +++ b/indra/newview/skins/default/xui/pt/floater_bulk_perms.xml @@ -7,20 +7,20 @@ Definindo permissões em [NAME] </floater.string> <floater.string name="start_text"> - Iniciando solicitação de mudança de permissão... + Solicitando mudança de permissão... </floater.string> <floater.string name="done_text"> Solicitação de mudança de permissão concluída. </floater.string> <check_box label="Animação" name="check_animation"/> <icon name="icon_animation" tool_tip="Animação"/> - <check_box label="Partes do Corpo" name="check_bodypart"/> + <check_box label="Partes do corpo" name="check_bodypart"/> <icon name="icon_bodypart" tool_tip="Partes do corpo"/> <check_box label="Roupas" name="check_clothing"/> <icon name="icon_clothing" tool_tip="Vestuário"/> <check_box label="Gestos" name="check_gesture"/> <icon name="icon_gesture" tool_tip="Gestos"/> - <check_box label="Notecards" name="check_notecard"/> + <check_box label="Anotações" name="check_notecard"/> <icon name="icon_notecard" tool_tip="Anotações"/> <check_box label="Objetos" name="check_object"/> <icon name="icon_object" tool_tip="Objects"/> @@ -30,7 +30,7 @@ <icon name="icon_sound" tool_tip="Sons"/> <check_box label="Texturas" name="check_texture"/> <icon name="icon_texture" tool_tip="Texturas"/> - <button label="√ Tudo" label_selected="Todas" name="check_all"/> + <button label="Tudo" label_selected="Todas" name="check_all"/> <button label="Limpar" label_selected="Nenhuma" name="check_none"/> <text name="newperms"> Novas autorizações de conteúdo diff --git a/indra/newview/skins/default/xui/pt/floater_customize.xml b/indra/newview/skins/default/xui/pt/floater_customize.xml index 318c73e52d..2a367cb24a 100644 --- a/indra/newview/skins/default/xui/pt/floater_customize.xml +++ b/indra/newview/skins/default/xui/pt/floater_customize.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <floater name="floater customize" title="APARÊNCIA" width="546"> <tab_container name="customize tab container" tab_min_width="115" width="544"> - <text label="Partes de corpo" name="body_parts_placeholder"> + <text label="Corpo" name="body_parts_placeholder"> Partes do corpo </text> <panel label="Forma" name="Shape"> @@ -43,15 +43,15 @@ <text name="Item Action Label"> Forma: </text> - <button label="Criar Nova Forma" label_selected="Criar Nova Forma" name="Create New"/> + <button label="Nova" label_selected="Nova" name="Create New"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> </panel> <panel label="Pele" name="Skin"> - <button label="Cor de Pele" label_selected="Cor de Pele" name="Skin Color" width="115"/> - <button label="Detalhes Faciais" label_selected="Detalhes Faciais" name="Face Detail" width="115"/> - <button label="Maquiagem" label_selected="Maquiagem" name="Makeup" width="115"/> - <button label="Detalhes do Corpo" label_selected="Detalhes do Corpo" name="Body Detail" width="115"/> + <button label="Cor de pele" label_selected="Cor de pele" name="Skin Color" width="115"/> + <button label="Detalhes faciais" label_selected="Detalhes faciais" name="Face Detail" width="115"/> + <button label="Maquilagem" label_selected="Maquilagem" name="Makeup" width="115"/> + <button label="Detalhes do corpo" label_selected="Detalhes do corpo" name="Body Detail" width="115"/> <text name="title"> [DESC] </text> @@ -79,7 +79,7 @@ <texture_picker label="Tattoo: cabeça" name="Head Tattoos" tool_tip="Clique para escolher um desenho" width="86"/> <texture_picker label="Tattoo: superior" name="Upper Tattoos" tool_tip="Clique para escolher um desenho" width="86"/> <texture_picker label="Tattoo: inferior" name="Lower Tattoos" tool_tip="Clique para escolher um desenho" width="86"/> - <button label="Criar Nova Pele" label_selected="Criar Nova Pele" name="Create New"/> + <button label="Novo" label_selected="Novo" name="Create New"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> <button label="Reverter" label_selected="Reverter" name="Revert"/> @@ -114,7 +114,7 @@ Cabelo: </text> <texture_picker label="Texture" name="Texture" tool_tip="Clique para escolher uma imagem"/> - <button label="Criar Novo Cabelo" label_selected="Criar Novo Cabelo" name="Create New"/> + <button label="Criar novo cabelo" label_selected="Criar novo cabelo" name="Create New"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> <button label="Reverter" label_selected="Reverter" name="Revert"/> @@ -145,7 +145,7 @@ Olhos: </text> <texture_picker label="Íris" name="Iris" tool_tip="Clique para escolher uma imagem"/> - <button label="Criar Novos Olhos" label_selected="Criar Novos Olhos" name="Create New"/> + <button label="Criar novos olhos" label_selected="Criar novos olhos" name="Create New"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> <button label="Reverter" label_selected="Reverter" name="Revert"/> @@ -157,7 +157,7 @@ <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/> <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> <button label="Remover" label_selected="Remover" name="Take Off"/> - <button label="Criar Nova Camisa" label_selected="Criar Nova Camisa" name="Create New"/> + <button label="Criar nova camisa" label_selected="Criar nova camisa" name="Create New"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> <button label="Reverter" label_selected="Reverter" name="Revert"/> @@ -190,7 +190,7 @@ <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/> <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> <button label="Remover" label_selected="Remover" name="Take Off"/> - <button label="Criar Novas Calças" label_selected="Criar Novas Calças" name="Create New"/> + <button label="Criar novas calças" label_selected="Criar novas calças" name="Create New"/> <button label="Salvar" label_selected="Salvar" name="Save"/> <button label="Salvar como..." label_selected="Salvar como..." name="Save As"/> <button label="Reverter" label_selected="Reverter" name="Revert"/> @@ -238,7 +238,7 @@ <text name="not worn instructions"> Para obter novos olhos, arraste um tipo de olhos do inventário para o seu avatar. Ou crie olhos novos. </text> - <button label="Criar Novos Sapatos" label_selected="Criar Novos Sapatos" name="Create New" width="166"/> + <button label="Criar novos sapatos" label_selected="Criar novos sapatos" name="Create New" width="166"/> <text name="no modify instructions"> Você não tem permissão para modificar esta vestimenta. </text> @@ -271,7 +271,7 @@ <text name="not worn instructions"> Para obter meias novas, arraste um par do inventário para o seu avatar. Ou crie meias novas. </text> - <button label="Criar Novas Meias" label_selected="Criar Novas Meias" name="Create New"/> + <button label="Criar novas meias" label_selected="Criar novas meias" name="Create New"/> <text name="no modify instructions"> Você não tem permissão para modificar essa vestimenta. </text> @@ -304,14 +304,14 @@ <text name="not worn instructions"> Para por uma jaqueta nova, arraste uma do inventário para o seu avatar. Ou crie uma jaqueta nova. </text> - <button label="Criar Nova Jaqueta" label_selected="Criar Nova Jaqueta" name="Create New"/> + <button label="Criar nova jaqueta" label_selected="Criar nova jaqueta" name="Create New"/> <text name="no modify instructions"> Você não tem permissão para modificar esta vestimenta. </text> <text name="Item Action Label"> Jaqueta: </text> - <texture_picker label="Tecido Superior" name="Upper Fabric" tool_tip="Clique para escolher uma imagem." width="84"/> + <texture_picker label="Tecido superior" name="Upper Fabric" tool_tip="Clique para escolher uma imagem." width="84"/> <texture_picker label="Tecido Inferior" name="Lower Fabric" tool_tip="Clique para escolher uma imagem." width="84"/> <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> <button label="Remover" label_selected="Remover" name="Take Off"/> @@ -338,7 +338,7 @@ <text name="not worn instructions"> Para obter luvas novas, arraste um par do inventário para o seu avatar. Ou crie luvas novas. </text> - <button label="Criar Novas Luvas" label_selected="Criar Novas Luvas" name="Create New"/> + <button label="Criar novas luvas" label_selected="Criar novas luvas" name="Create New"/> <text name="no modify instructions"> Você não tem permissão para modificar essa vestimenta. </text> @@ -371,7 +371,7 @@ <text name="not worn instructions"> Para obter uma camiseta nova, arraste uma do inventário para o seu avatar. Ou crie uma camiseta nova. </text> - <button label="Criar Nova Camiseta" label_selected="Criar Nova Camiseta" name="Create New"/> + <button label="Criar nova camiseta" label_selected="Criar nova camiseta" name="Create New"/> <text name="no modify instructions"> Você não ter permissão para modificar essa vestimenta. </text> @@ -404,12 +404,12 @@ <text name="not worn instructions"> Para obter roupa de baixo nova, arraste um modelo do inventário para o seu avatar. Ou crie uma roupa de baixo nova. </text> - <button label="Criar Novas Roupas de Baixo" label_selected="Criar Novas Roupas de Baixo" name="Create New" width="180"/> + <button label="Criar novas" label_selected="Criar novas" name="Create New" width="180"/> <text name="no modify instructions"> Você não tem permissão para modificar essa vestimenta. </text> <text name="Item Action Label"> - Roupas de Baixo: + Roupas de baixo: </text> <texture_picker label="Tecido" name="Fabric" tool_tip="Clique para escolher uma imagem"/> <color_swatch label="Cor/Tint" name="Color/Tint" tool_tip="Selecionar a cor"/> @@ -437,7 +437,7 @@ <text name="not worn instructions"> Para obter um saia nova, arraste uma saia do inventário para o seu avatar. Ou crie uma saia nova. </text> - <button label="Criar Nova Saia" label_selected="Criar Nova Saia" name="Create New"/> + <button label="Criar nova saia" label_selected="Criar nova saia" name="Create New"/> <text name="no modify instructions"> Você não tem permissão para modificar esta vestimenta. </text> diff --git a/indra/newview/skins/default/xui/pt/floater_preferences.xml b/indra/newview/skins/default/xui/pt/floater_preferences.xml index 803f2f87b8..2736900d5f 100644 --- a/indra/newview/skins/default/xui/pt/floater_preferences.xml +++ b/indra/newview/skins/default/xui/pt/floater_preferences.xml @@ -3,7 +3,7 @@ <button label="OK" label_selected="OK" name="OK"/> <button label="Cancelar" label_selected="Cancelar" name="Cancel"/> <tab_container name="pref core" tab_width="128" width="628"> - <panel label="Público geral" name="general"/> + <panel label="Geral" name="general"/> <panel label="Vídeo" name="display"/> <panel label="Privacidade" name="im"/> <panel label="Som e mídia" name="audio"/> diff --git a/indra/newview/skins/default/xui/pt/floater_snapshot.xml b/indra/newview/skins/default/xui/pt/floater_snapshot.xml index a3934a6667..bb852cb11a 100644 --- a/indra/newview/skins/default/xui/pt/floater_snapshot.xml +++ b/indra/newview/skins/default/xui/pt/floater_snapshot.xml @@ -3,7 +3,7 @@ <text name="type_label"> Destino da foto </text> - <radio_group label="Tipo de Foto" name="snapshot_type_radio"> + <radio_group label="Tipo de foto" name="snapshot_type_radio"> <radio_item label="Email" name="postcard"/> <radio_item label="Meu inventário (L$[AMOUNT])" name="texture"/> <radio_item label="Salvar no meu PC" name="local"/> @@ -28,21 +28,21 @@ Formato </text> <combo_box label="Resolução" name="postcard_size_combo"> - <combo_box.item label="Janela Atual" name="CurrentWindow"/> + <combo_box.item label="Janela atual" name="CurrentWindow"/> <combo_box.item label="640x480" name="640x480"/> <combo_box.item label="800x600" name="800x600"/> <combo_box.item label="1024x768" name="1024x768"/> <combo_box.item label="Customizado" name="Custom"/> </combo_box> <combo_box label="Resolução" name="texture_size_combo"> - <combo_box.item label="Janela Atual" name="CurrentWindow"/> + <combo_box.item label="Janela atual" name="CurrentWindow"/> <combo_box.item label="Pequeno (128x128)" name="Small(128x128)"/> <combo_box.item label="Médio (256x256)" name="Medium(256x256)"/> <combo_box.item label="Grande (512x512)" name="Large(512x512)"/> <combo_box.item label="Customizado" name="Custom"/> </combo_box> <combo_box label="Resolução" name="local_size_combo"> - <combo_box.item label="Janela Atual" name="CurrentWindow"/> + <combo_box.item label="Janela atual" name="CurrentWindow"/> <combo_box.item label="320x240" name="320x240"/> <combo_box.item label="640x480" name="640x480"/> <combo_box.item label="800x600" name="800x600"/> @@ -63,10 +63,10 @@ <text name="layer_type_label"> Capturar: </text> - <combo_box label="Camadas da Imagem" name="layer_types"> + <combo_box label="Camadas da imagem" name="layer_types"> <combo_box.item label="Cores" name="Colors"/> <combo_box.item label="Formato" name="Depth"/> - <combo_box.item label="Decoração do Objeto" name="ObjectMattes"/> + <combo_box.item label="Decoração do objeto" name="ObjectMattes"/> </combo_box> <check_box label="Interface" name="ui_check"/> <check_box bottom_delta="-17" label="HUDs" name="hud_check"/> diff --git a/indra/newview/skins/default/xui/pt/floater_tools.xml b/indra/newview/skins/default/xui/pt/floater_tools.xml index fb44c5c3bf..958a166dfc 100644 --- a/indra/newview/skins/default/xui/pt/floater_tools.xml +++ b/indra/newview/skins/default/xui/pt/floater_tools.xml @@ -63,7 +63,7 @@ <radio_item label="Stretch (Ctrl+Shift)" name="radio stretch"/> <radio_item label="Face selecionada" name="radio select face"/> </radio_group> - <check_box label="Editar item linkado" name="checkbox edit linked parts"/> + <check_box label="Editar partes linkadas" name="checkbox edit linked parts"/> <text name="RenderingCost" tool_tip="Mostra o cálculo do custo de renderização do objeto"> þ: [COUNT] </text> @@ -91,7 +91,7 @@ <button label="" label_selected="" name="ToolRing" tool_tip="Anel"/> <button label="" label_selected="" name="ToolTree" tool_tip="Árvore"/> <button label="" label_selected="" name="ToolGrass" tool_tip="Grama"/> - <check_box label="Ficar com ferramenta selecionado" name="checkbox sticky"/> + <check_box label="Ficar com ferramenta selecionada" name="checkbox sticky"/> <check_box label="Copiar seleção" name="checkbox copy selection"/> <check_box initial_value="true" label="Copiar parte central" name="checkbox copy centers"/> <check_box label="Girar cópia" name="checkbox copy rotates"/> diff --git a/indra/newview/skins/default/xui/pt/menu_inventory.xml b/indra/newview/skins/default/xui/pt/menu_inventory.xml index 8b565b9645..2691ac81b3 100644 --- a/indra/newview/skins/default/xui/pt/menu_inventory.xml +++ b/indra/newview/skins/default/xui/pt/menu_inventory.xml @@ -6,21 +6,21 @@ <menu_item_call label="Propriedades" name="Task Properties"/> <menu_item_call label="Renomear" name="Task Rename"/> <menu_item_call label="Apagar" name="Task Remove"/> - <menu_item_call label="Limpar Lixeira" name="Empty Trash"/> - <menu_item_call label="Limpar Achados e perdidos" name="Empty Lost And Found"/> - <menu_item_call label="Nova Pasta" name="New Folder"/> - <menu_item_call label="Novo Script" name="New Script"/> + <menu_item_call label="Limpar lixeira" name="Empty Trash"/> + <menu_item_call label="Limpar Achados & perdidos" name="Empty Lost And Found"/> + <menu_item_call label="Nova pasta" name="New Folder"/> + <menu_item_call label="Novo script" name="New Script"/> <menu_item_call label="Nova anotação" name="New Note"/> - <menu_item_call label="Novo Gesto" name="New Gesture"/> + <menu_item_call label="Novo gesto" name="New Gesture"/> <menu label="Novas roupas" name="New Clothes"> - <menu_item_call label="Nova Camisa" name="New Shirt"/> - <menu_item_call label="Nova Calça" name="New Pants"/> - <menu_item_call label="Novos Calçados" name="New Shoes"/> - <menu_item_call label="Novas Meias" name="New Socks"/> - <menu_item_call label="Nova Jaqueta" name="New Jacket"/> - <menu_item_call label="Nova Saia" name="New Skirt"/> - <menu_item_call label="Novas Luvas" name="New Gloves"/> - <menu_item_call label="Nova Anágua" name="New Undershirt"/> + <menu_item_call label="Nova camisa" name="New Shirt"/> + <menu_item_call label="Nova calça" name="New Pants"/> + <menu_item_call label="Novos calçados" name="New Shoes"/> + <menu_item_call label="Novas meias" name="New Socks"/> + <menu_item_call label="Nova jaqueta" name="New Jacket"/> + <menu_item_call label="Nova saia" name="New Skirt"/> + <menu_item_call label="Novas luvas" name="New Gloves"/> + <menu_item_call label="Nova anágua" name="New Undershirt"/> <menu_item_call label="Nova roupa de baixo" name="New Underpants"/> <menu_item_call label="Nova máscara alfa" name="New Alpha Mask"/> <menu_item_call label="Nova tatuagem" name="New Tattoo"/> @@ -53,29 +53,29 @@ <menu_item_call label="Abrir" name="Open"/> <menu_item_call label="Propriedades" name="Properties"/> <menu_item_call label="Renomear" name="Rename"/> - <menu_item_call label="Copy Asset UUID" name="Copy Asset UUID"/> + <menu_item_call label="Copiar item UUID" name="Copy Asset UUID"/> <menu_item_call label="Copiar" name="Copy"/> <menu_item_call label="Colar" name="Paste"/> <menu_item_call label="Colar como link" name="Paste As Link"/> <menu_item_call label="Apagar" name="Delete"/> <menu_item_call label="Excluir pasta do sistema" name="Delete System Folder"/> - <menu_item_call label="Iniciar conversa em conferência" name="Conference Chat Folder"/> - <menu_item_call label="Executar" name="Sound Play"/> + <menu_item_call label="Pasta conversa em conferência" name="Conference Chat Folder"/> + <menu_item_call label="Executar som" name="Sound Play"/> <menu_item_call label="Sobre o marco" name="About Landmark"/> - <menu_item_call label="Tocar inworld" name="Animation Play"/> - <menu_item_call label="Executar localmente" name="Animation Audition"/> - <menu_item_call label="Mandar Mensagem Instantânea" name="Send Instant Message"/> + <menu_item_call label="Executar animação" name="Animation Play"/> + <menu_item_call label="Executar áudio" name="Animation Audition"/> + <menu_item_call label="Mandar MI" name="Send Instant Message"/> <menu_item_call label="Oferecer teletransporte..." name="Offer Teleport..."/> - <menu_item_call label="Iniciar conversa em conferência" name="Conference Chat"/> + <menu_item_call label="Bate-papo em conferência" name="Conference Chat"/> <menu_item_call label="Ativar" name="Activate"/> <menu_item_call label="Desativar" name="Deactivate"/> <menu_item_call label="Salvar como" name="Save As"/> - <menu_item_call label="Retirar de você" name="Detach From Yourself"/> - <menu_item_call label="Vestir" name="Object Wear"/> + <menu_item_call label="Retirar de si mesmo" name="Detach From Yourself"/> + <menu_item_call label="Vestir objeto" name="Object Wear"/> <menu label="Anexar a" name="Attach To"/> <menu label="Anexar ao HUD" name="Attach To HUD"/> <menu_item_call label="Editar" name="Wearable Edit"/> <menu_item_call label="Vestir" name="Wearable Wear"/> - <menu_item_call label="Retirar" name="Take Off"/> + <menu_item_call label="Tirar" name="Take Off"/> <menu_item_call label="--Sem opções--" name="--no options--"/> </menu> diff --git a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml index 81898c63bf..fc40384891 100644 --- a/indra/newview/skins/default/xui/pt/menu_inventory_add.xml +++ b/indra/newview/skins/default/xui/pt/menu_inventory_add.xml @@ -24,7 +24,7 @@ <menu_item_call label="Nova tatuagem" name="New Tattoo"/> </menu> <menu label="Nova parte do corpo" name="New Body Parts"> - <menu_item_call label="Nova silhueta" name="New Shape"/> + <menu_item_call label="Nova forma" name="New Shape"/> <menu_item_call label="Nova pele" name="New Skin"/> <menu_item_call label="Novo cabelo" name="New Hair"/> <menu_item_call label="Novos olhos" name="New Eyes"/> diff --git a/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml b/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml index b4216b7ddc..ec1e7a0950 100644 --- a/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml +++ b/indra/newview/skins/default/xui/pt/menu_teleport_history_item.xml @@ -2,5 +2,5 @@ <context_menu name="Teleport History Item Context Menu"> <menu_item_call label="Teletransportar" name="Teleport"/> <menu_item_call label="Mais informações" name="More Information"/> - <menu_item_call label="Copiar para área de transferência" name="CopyToClipboard"/> + <menu_item_call label="Copiar" name="CopyToClipboard"/> </context_menu> diff --git a/indra/newview/skins/default/xui/pt/menu_viewer.xml b/indra/newview/skins/default/xui/pt/menu_viewer.xml index 2b83386cad..45f7ca1424 100644 --- a/indra/newview/skins/default/xui/pt/menu_viewer.xml +++ b/indra/newview/skins/default/xui/pt/menu_viewer.xml @@ -80,7 +80,7 @@ <menu_item_call label="Link" name="Link"/> <menu_item_call label="Desconectar links" name="Unlink"/> <menu_item_check label="Edit Linked Parts" name="Edit Linked Parts"/> - <menu_item_call label="Focus on Selection" name="Focus on Selection"/> + <menu_item_call label="Enfocar seleção" name="Focus on Selection"/> <menu_item_call label="Ampliar seleção" name="Zoom to Selection"/> <menu label="Objeto:" name="Object"> <menu_item_call label="Comprar" name="Menu Object Buy"/> @@ -92,29 +92,29 @@ <menu label="Scripts" name="Scripts"> <menu_item_call label="Recompilar scripts (LSL)" name="Mono"/> <menu_item_call label="Recompilar scripts (LSL)" name="LSL"/> - <menu_item_call label="Reset Scripts" name="Reset Scripts"/> + <menu_item_call label="Resetar scripts" name="Reset Scripts"/> <menu_item_call label="Scripts em modo execução" name="Set Scripts to Running"/> <menu_item_call label="Scripts em modo não execução" name="Set Scripts to Not Running"/> </menu> <menu label="Opções" name="Options"> - <menu_item_call label="Set Default Upload Permissions" name="perm prefs"/> + <menu_item_call label="Definir permissões padrão de upload" name="perm prefs"/> <menu_item_check label="Mostrar permissões avançadas" name="DebugPermissions"/> <menu_item_check label="Só selecionar meus objetos" name="Select Only My Objects"/> - <menu_item_check label="Só selecionar meus objetos" name="Select Only Movable Objects"/> + <menu_item_check label="Só selecionar objetos móveis" name="Select Only Movable Objects"/> <menu_item_check label="Selecionar contornando" name="Select By Surrounding"/> <menu_item_check label="Mostrar seleção oculta" name="Show Hidden Selection"/> - <menu_item_check label="Show Light Radius for Selection" name="Show Light Radius for Selection"/> - <menu_item_check label="Show Selection Beam" name="Show Selection Beam"/> - <menu_item_check label="Mostrar na grade" name="Snap to Grid"/> - <menu_item_call label="Snap Object XY to Grid" name="Snap Object XY to Grid"/> + <menu_item_check label="Mostrar alcance de luz da seleção" name="Show Light Radius for Selection"/> + <menu_item_check label="Mostrar raio de seleção" name="Show Selection Beam"/> + <menu_item_check label="Encaixar em grade" name="Snap to Grid"/> + <menu_item_call label="Encaixar objeto XY em grade" name="Snap Object XY to Grid"/> <menu_item_call label="Usar seleção em grade" name="Use Selection for Grid"/> <menu_item_call label="Opções de grade" name="Grid Options"/> </menu> <menu label="Selecionar partes conectadas" name="Select Linked Parts"> - <menu_item_call label="Select Next Part" name="Select Next Part"/> - <menu_item_call label="Select Previous Part" name="Select Previous Part"/> - <menu_item_call label="Include Next Part" name="Include Next Part"/> - <menu_item_call label="Include Previous Part" name="Include Previous Part"/> + <menu_item_call label="Selecionar próxima parte" name="Select Next Part"/> + <menu_item_call label="Selecionar parte anterior" name="Select Previous Part"/> + <menu_item_call label="Incluir próxima parte" name="Include Next Part"/> + <menu_item_call label="Incluir parte anterior" name="Include Previous Part"/> </menu> </menu> <menu label="Ajuda" name="Help"> @@ -133,9 +133,9 @@ <menu_item_check label="Compactar fotos para HD" name="QuietSnapshotsToDisk"/> <menu_item_check label="Compactar fotos para HD" name="CompressSnapshotsToDisk"/> <menu label="Ferramentas de desempenho" name="Performance Tools"> - <menu_item_call label="Lag Meter" name="Lag Meter"/> + <menu_item_call label="Medidor de lag" name="Lag Meter"/> <menu_item_check label="Barra de estatísticas" name="Statistics Bar"/> - <menu_item_check label="Show Avatar Rendering Cost" name="Avatar Rendering Cost"/> + <menu_item_check label="Carga de renderização de avatar" name="Avatar Rendering Cost"/> </menu> <menu label="Realces e visibilidade" name="Highlighting and Visibility"> <menu_item_check label="Efeito baliza piscando" name="Cheesy Beacon"/> @@ -166,13 +166,13 @@ <menu_item_check label="Selecionado" name="Selected"/> <menu_item_check label="Realçado" name="Highlighted"/> <menu_item_check label="Texturas dinâmicas" name="Dynamic Textures"/> - <menu_item_check label="Foot Shadows" name="Foot Shadows"/> - <menu_item_check label="Fog" name="Fog"/> - <menu_item_check label="Flexible Objects" name="Flexible Objects"/> + <menu_item_check label="Sombras nos pés" name="Foot Shadows"/> + <menu_item_check label="Neblina" name="Fog"/> + <menu_item_check label="Objetos flexíveis" name="Flexible Objects"/> </menu> <menu_item_check label="Executar diversas instâncias" name="Run Multiple Threads"/> <menu_item_call label="Limpar cache de grupo" name="ClearGroupCache"/> - <menu_item_check label="Mouse Smoothing" name="Mouse Smoothing"/> + <menu_item_check label="Smoothing de mouse" name="Mouse Smoothing"/> <menu label="Atalhos" name="Shortcuts"> <menu_item_call label="Imagem (L$[COST])..." name="Upload Image"/> <menu_item_check label="Busca" name="Search"/> @@ -205,7 +205,7 @@ <menu label="Desenvolver" name="Develop"> <menu label="Painéis" name="Consoles"> <menu_item_check label="Painel de textura" name="Texture Console"/> - <menu_item_check label="Debug Console" name="Debug Console"/> + <menu_item_check label="Console de depuração" name="Debug Console"/> <menu_item_call label="Painel de avisos" name="Notifications"/> <menu_item_check label="Painel de tamanho de textura" name="Texture Size"/> <menu_item_check label="Painel de texturas" name="Texture Category"/> @@ -218,7 +218,7 @@ </menu> <menu label="Show Info" name="Display Info"> <menu_item_check label="Mostrar hora" name="Show Time"/> - <menu_item_check label="Show Render Info" name="Show Render Info"/> + <menu_item_check label="Dados de renderização" name="Show Render Info"/> <menu_item_check label="Mostrar cor sob o cursor" name="Show Color Under Cursor"/> <menu_item_check label="Mostrar mudanças a objetos" name="Show Updates"/> </menu> @@ -239,7 +239,7 @@ </menu> <menu label="Rendering" name="Rendering"> <menu_item_check label="Axes" name="Axes"/> - <menu_item_check label="Contornos" name="Wireframe"/> + <menu_item_check label="Wireframe" name="Wireframe"/> <menu_item_check label="Global Illumination" name="Global Illumination"/> <menu_item_check label="Texturas de animação" name="Animation Textures"/> <menu_item_check label="Desativar texturas" name="Disable Textures"/> @@ -247,11 +247,11 @@ <menu_item_check label="Render Attached Particles" name="Render Attached Particles"/> <menu_item_check label="Objetos iridescentes" name="Hover Glow Objects"/> </menu> - <menu label="Network" name="Network"> + <menu label="Rede" name="Network"> <menu_item_check label="Pausar avatar" name="AgentPause"/> <menu_item_call label="Drop a Packet" name="Drop a Packet"/> </menu> - <menu_item_call label="Bumps, Pushes & Hits" name="Bumps, Pushes &amp; Hits"/> + <menu_item_call label="Empurrões, trombadas e tapas" name="Bumps, Pushes &amp; Hits"/> <menu label="Mundo" name="World"> <menu_item_check label="Impor sobre sol regional" name="Sim Sun Override"/> <menu_item_check label="Efeito baliza piscando" name="Cheesy Beacon"/> @@ -261,15 +261,15 @@ <menu label="Interface" name="UI"> <menu_item_call label="Teste de navegador web" name="Web Browser Test"/> <menu_item_call label="Print Selected Object Info" name="Print Selected Object Info"/> - <menu_item_call label="Memory Stats" name="Memory Stats"/> + <menu_item_call label="Dados de memória" name="Memory Stats"/> <menu_item_check label="Double-Click Auto-Pilot" name="Double-ClickAuto-Pilot"/> <menu_item_check label="Debug Clicks" name="Debug Clicks"/> <menu_item_check label="Debug Mouse Events" name="Debug Mouse Events"/> </menu> <menu label="XUI" name="XUI"> <menu_item_call label="Recarregar cores" name="Reload Color Settings"/> - <menu_item_call label="Show Font Test" name="Show Font Test"/> - <menu_item_call label="Load from XML" name="Load from XML"/> + <menu_item_call label="Teste de fonte" name="Show Font Test"/> + <menu_item_call label="Carregar de XML" name="Load from XML"/> <menu_item_call label="Salvar para XML" name="Save to XML"/> <menu_item_check label="Mostrar nomes XUI" name="Show XUI Names"/> <menu_item_call label="Enviar MIs de teste" name="Send Test IMs"/> diff --git a/indra/newview/skins/default/xui/pt/notifications.xml b/indra/newview/skins/default/xui/pt/notifications.xml index 1480343dc1..5f91ff09e5 100644 --- a/indra/newview/skins/default/xui/pt/notifications.xml +++ b/indra/newview/skins/default/xui/pt/notifications.xml @@ -1282,8 +1282,8 @@ Salvar na pasta Aplicativos? </notification> <notification name="GroupLeaveConfirmMember"> Você é atualmente um membro do grupo [GROUP]. -Deixar este grupo? - <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Deixar"/> +Sair do grupo? + <usetemplate name="okcancelbuttons" notext="Cancelar" yestext="Sair"/> </notification> <notification name="ConfirmKick"> Tem CERTEZA de que deseja expulsar todos os residentes do grid? @@ -1294,7 +1294,7 @@ Deixar este grupo? <usetemplate name="okbutton" yestext="OK"/> </notification> <notification name="CannotStartAuctionAlreadyForSale"> - Você não pode começar um leilão com um lote que já foi colocado à venda. Desabilite a venda da terra se você tem certeza que deseja iniciar um leilão. + Você não pode começar um leilão com um lote que já foi colocado à venda. Desabilite a venda se você tem certeza que deseja fazer um leilão. </notification> <notification label="Falha ao bloquear objeto por nome" name="MuteByNameFailed"> Você já bloqueou este residente. diff --git a/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml b/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml index c11d800171..23cde50acc 100644 --- a/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml +++ b/indra/newview/skins/default/xui/pt/panel_edit_tattoo.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="edit_tattoo_panel"> <panel name="avatar_tattoo_color_panel"> - <texture_picker label="Tatoo de cabeça" name="Head Tattoo" tool_tip="Clique para escolher uma foto"/> - <texture_picker label="Tatoo da parte superior do corpo" name="Upper Tattoo" tool_tip="Clique para escolher uma foto"/> - <texture_picker label="Tatoo da parte inferior do corpo" name="Lower Tattoo" tool_tip="Clique para escolher uma foto"/> + <texture_picker label="Tatuagem de cabeça" name="Head Tattoo" tool_tip="Clique para escolher uma foto"/> + <texture_picker label="Tatuagem superior" name="Upper Tattoo" tool_tip="Selecione uma foto"/> + <texture_picker label="Tatuagem inferior" name="Lower Tattoo" tool_tip="Selecione uma foto"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_group_general.xml b/indra/newview/skins/default/xui/pt/panel_group_general.xml index 85488f43af..0b65b4aade 100644 --- a/indra/newview/skins/default/xui/pt/panel_group_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_general.xml @@ -46,7 +46,7 @@ Para obter mais ajuda, passe o mouse sobre as opções. <check_box label="Qualquer um pode entrar" name="open_enrollement" tool_tip="Controla a entrada de novos membros, com ou sem convite."/> <check_box label="Taxa de inscrição" name="check_enrollment_fee" tool_tip="Controla a cobrança de uma taxa de associação ao grupo."/> <spinner label="L$" left_delta="120" name="spin_enrollment_fee" tool_tip="Se a opção 'Taxa de associação' estiver marcada, novos membros precisam pagar o valor definido para entrar no grupo." width="60"/> - <combo_box name="group_mature_check" tool_tip="Define se a informação do seu grupo é considerada mature." width="170"> + <combo_box name="group_mature_check" tool_tip="Define se os dados do seu grupo são conteúdo moderado." width="170"> <combo_box.item label="Conteúdo PG" name="pg"/> <combo_box.item label="Conteúdo Mature" name="mature"/> </combo_box> diff --git a/indra/newview/skins/default/xui/pt/panel_group_notices.xml b/indra/newview/skins/default/xui/pt/panel_group_notices.xml index 2abc8bc7c8..4b5a00c761 100644 --- a/indra/newview/skins/default/xui/pt/panel_group_notices.xml +++ b/indra/newview/skins/default/xui/pt/panel_group_notices.xml @@ -19,10 +19,10 @@ Cada grupo pode enviar no máximo 200 avisos/dia Nenhum resultado foi encontrado. </text> <button label="Criar um novo aviso" label_selected="Criar nova notícia" name="create_new_notice" tool_tip="Criar um novo aviso"/> - <button label="Atualizar" label_selected="Atualizar Lista" name="refresh_notices" tool_tip="Atualizar lista de avisos"/> + <button label="Atualizar" label_selected="Atualizar lista" name="refresh_notices" tool_tip="Atualizar lista de avisos"/> <panel label="Criar nova notícia" name="panel_create_new_notice"> <text name="lbl"> - Criar uma notícia + Criar notícia </text> <text left="20" name="lbl3"> Assunto: @@ -43,7 +43,7 @@ Cada grupo pode enviar no máximo 200 avisos/dia <button label="Enviar" label_selected="Enviar" name="send_notice"/> <group_drop_target name="drop_target" tool_tip="Arrastar um item do inventário para a caixa para enviá-lo com o aviso. É preciso ter autorização de cópia e transferência do item para anexá-lo ao aviso."/> </panel> - <panel label="Visualizar Notícia Anterior" name="panel_view_past_notice"> + <panel label="Visualizar notícia anterior" name="panel_view_past_notice"> <text name="lbl"> Notícia arquivada </text> diff --git a/indra/newview/skins/default/xui/pt/panel_groups.xml b/indra/newview/skins/default/xui/pt/panel_groups.xml index aaea1178a6..0aea0d53dd 100644 --- a/indra/newview/skins/default/xui/pt/panel_groups.xml +++ b/indra/newview/skins/default/xui/pt/panel_groups.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel name="groups"> <text name="groupdesc" width="268"> - Seu grupo ativo atual es'ta mostrado em negrito. + Seu grupo ativo atual está em negrito. </text> <text name="groupcount" width="300"> - Você pertence a [COUNT] grupos (de no máximo [MAX]). + Você pertence a [COUNT] grupos (máximo [MAX]). </text> - <button width="86" label="MI/Chamada" name="IM" tool_tip="Abrir sessão de Mensagem Instantânea"/> + <button width="86" label="MI/Ligação" name="IM" tool_tip="Abrir sessão de Mensagem Instantânea"/> <button width="86" label="Informações" name="Info"/> <button width="86" label="Ativar" name="Activate"/> - <button width="86" label="Deixar" name="Leave"/> + <button width="86" label="Sair" name="Leave"/> <button width="86" label="Criar..." name="Create"/> <button width="86" label="Buscar..." name="Search..."/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml index 4ba6746614..104c3bface 100644 --- a/indra/newview/skins/default/xui/pt/panel_main_inventory.xml +++ b/indra/newview/skins/default/xui/pt/panel_main_inventory.xml @@ -44,7 +44,7 @@ <menu_item_call label="Nova tatuagem" name="New Tattoo"/> </menu> <menu label="Nova parte do corpo" name="New Body Parts"> - <menu_item_call label="Nova silhueta" name="New Shape"/> + <menu_item_call label="Nova forma" name="New Shape"/> <menu_item_call label="Nova pele" name="New Skin"/> <menu_item_call label="Novo cabelo" name="New Hair"/> <menu_item_call label="Novos olhos" name="New Eyes"/> diff --git a/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml b/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml index 9815b8d0b4..43c0820036 100644 --- a/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_media_settings_general.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> -<panel label="Público geral" name="Media Settings General"> +<panel label="Geral" name="Media Settings General"> <text name="home_label"> Página web: </text> diff --git a/indra/newview/skins/default/xui/pt/panel_people.xml b/indra/newview/skins/default/xui/pt/panel_people.xml index 66938e8f6f..1516a2bb65 100644 --- a/indra/newview/skins/default/xui/pt/panel_people.xml +++ b/indra/newview/skins/default/xui/pt/panel_people.xml @@ -48,12 +48,12 @@ Para conhecer mais gente, use [secondlife:///app/worldmap o Mapa]. </tab_container> <panel name="button_bar"> <button label="Perfil" name="view_profile_btn" tool_tip="Exibir fotografia, grupos e outras informações dos residentes"/> - <button label="MI" name="im_btn" tool_tip="Abrir sessão de mensagem instantânea"/> + <button label="MI" name="im_btn" tool_tip="Iniciar MI"/> <button label="Chamada" name="call_btn" tool_tip="Ligar para este residente"/> <button label="Compartilhar" name="share_btn"/> <button label="Teletransporte" name="teleport_btn" tool_tip="Oferecer teletransporte"/> <button label="Perfil do grupo" name="group_info_btn" tool_tip="Exibir informação de grupo"/> - <button label="Bate- papo de grupo" name="chat_btn" tool_tip="abrir sessão de bate- papo"/> + <button label="Bate-papo de grupo" name="chat_btn" tool_tip="Iniciar bate-papo"/> <button label="Ligar para o grupo" name="group_call_btn" tool_tip="Ligar para este grupo"/> </panel> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_place_profile.xml b/indra/newview/skins/default/xui/pt/panel_place_profile.xml index 5c81c7649b..03f997f31b 100644 --- a/indra/newview/skins/default/xui/pt/panel_place_profile.xml +++ b/indra/newview/skins/default/xui/pt/panel_place_profile.xml @@ -6,7 +6,7 @@ <string name="available" value="disponível"/> <string name="allocated" value="alocados"/> <string name="title_place" value="Perfil da região"/> - <string name="title_teleport_history" value="Histórico de teletransportes"/> + <string name="title_teleport_history" value="Teletransportes"/> <string name="not_available" value="(N\A)"/> <string name="unknown" value="(Desconhecido)"/> <string name="public" value="(público)"/> diff --git a/indra/newview/skins/default/xui/pt/panel_places.xml b/indra/newview/skins/default/xui/pt/panel_places.xml index d9045e1a37..9da4201c85 100644 --- a/indra/newview/skins/default/xui/pt/panel_places.xml +++ b/indra/newview/skins/default/xui/pt/panel_places.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Lugares" name="places panel"> <string name="landmarks_tab_title" value="MEUS MARCOS"/> - <string name="teleport_history_tab_title" value="HISTÓRICO DE TELETRANSPORTES"/> + <string name="teleport_history_tab_title" value="TELETRANSPORTES"/> <filter_editor label="Filtrar meus lugares" name="Filter"/> <panel name="button_panel"> <button label="Teletransportar" name="teleport_btn" tool_tip="Teletransportar para a área selecionada"/> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml index 95a2e47eba..f30c218c81 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_advanced.xml @@ -16,17 +16,17 @@ <check_box label="Mostre-me em visão de mouse" name="first_person_avatar_visible"/> <check_box label="Teclas de seta sempre me movem" name="arrow_keys_move_avatar_check"/> <check_box label="Dê dois toques e pressione para correr" name="tap_tap_hold_to_run"/> - <check_box label="Mover os lábios do avatar quando estiver falando" name="enable_lip_sync"/> + <check_box label="Mover os lábios do avatar ao falar" name="enable_lip_sync"/> <check_box label="Balão de bate-papo" name="bubble_text_chat"/> <slider label="Opacidade" name="bubble_chat_opacity"/> - <color_swatch name="background" tool_tip="Escolha a cor do balão de bate-papo"/> + <color_swatch name="background" tool_tip="Cor do balão de bate-papo"/> <check_box label="Mostrar erros de script" name="show_script_errors"/> <radio_group name="show_location"> <radio_item label="Bate-papo local" name="0"/> <radio_item label="Janelas separadas" name="1"/> </radio_group> - <check_box label="Tecla liga/desliga da minha voz:" name="push_to_talk_toggle_check" tool_tip="Quando em modo de alternância, pressione e solte o botão UMA vez para ligar e desligar o microfone. Quando em modo de alternância, o microfone só transmite sua enquanto o botão estiver pressionado."/> - <line_editor label="Botao apertar e falar" name="modifier_combo"/> - <button label="Definir chave" name="set_voice_hotkey_button"/> + <check_box label="Tecla liga/desliga da minha voz:" name="push_to_talk_toggle_check" tool_tip="Quando em modo de alternância, pressione e solte o botão UMA vez para ligar e desligar o microfone. Quando em modo de alternância, o microfone só transmite sua voz quando o botão estiver pressionado."/> + <line_editor label="Botão apertar e falar" name="modifier_combo"/> + <button label="Definir tecla" name="set_voice_hotkey_button"/> <button label="Botão do meio do mouse" name="set_voice_middlemouse_button" tool_tip="Redefinir como botão do meio do mouse"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml index 0c2e67b4d5..e566fde27c 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_chat.xml @@ -5,7 +5,7 @@ </text> <radio_group name="chat_font_size"> <radio_item label="Pequeno" name="radio" value="0"/> - <radio_item label="Média" name="radio2" value="1"/> + <radio_item label="Médio" name="radio2" value="1"/> <radio_item label="Grande" name="radio3" value="2"/> </radio_group> <text name="font_colors"> @@ -44,14 +44,14 @@ URLs </text> <check_box initial_value="true" label="Executar animação digitada quando estiver conversando" name="play_typing_animation"/> - <check_box label="Envie MIs por email quando eu estiver desconectado" name="send_im_to_email"/> + <check_box label="Enviar MIs por email se estiver desconectado" name="send_im_to_email"/> <text name="show_ims_in_label"> Mostrar MIs em: </text> <text name="requires_restart_label"> (Reinicie para ativar) </text> - <radio_group name="chat_window" tool_tip="Exibir cada bate-papo em uma janela separada, ou exibir todos em uma única janela com uma aba para cada pessoa (requer reinício)"> + <radio_group name="chat_window" tool_tip="Exibir cada bate-papo em uma janela separada ou exibir todos em uma única janela com uma aba para cada pessoa (requer reinício)"> <radio_item label="Janelas separadas" name="radio" value="0"/> <radio_item label="Guias" name="radio2" value="1"/> </radio_group> diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml index 7a3e69c988..5c69fa8de1 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_general.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_general.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" standalone="yes"?> <panel label="Geral" name="general_panel"> <text name="language_textbox"> - Linguagem: + Idioma: </text> <combo_box name="language_combobox"> <combo_box.item label="Padrão" name="System Default Language"/> @@ -20,20 +20,20 @@ (Reinicie para mostrar o novo idioma) </text> <text name="maturity_desired_prompt"> - Eu quero acessar conteúdo classificado: + Quero acessar conteúdo: </text> <text name="maturity_desired_textbox"/> <combo_box name="maturity_desired_combobox"> - <combo_box.item label="PG, Mature e Adult" name="Desired_Adult"/> - <combo_box.item label="PG e Mature" name="Desired_Mature"/> - <combo_box.item label="PG" name="Desired_PG"/> + <combo_box.item label="Geral, Moderado e Adulto" name="Desired_Adult"/> + <combo_box.item label="Geral e Moderado" name="Desired_Mature"/> + <combo_box.item label="Geral" name="Desired_PG"/> </combo_box> <text name="start_location_textbox"> - Ponto de partida: + Posição inicial: </text> <combo_box name="start_location_combo"> - <combo_box.item label="Minha Última Localidade" name="MyLastLocation" tool_tip="Por padrão, registrar na minha última localidade."/> - <combo_box.item label="Minha Casa" name="MyHome" tool_tip="Como padrão, registrar na minha casa."/> + <combo_box.item label="Última localização" name="MyLastLocation" tool_tip="Voltar ao lugar onde estava antes."/> + <combo_box.item label="Meu início" name="MyHome" tool_tip="Voltar ao meu início."/> </combo_box> <check_box initial_value="true" label="Mostrar ao entrar" name="show_location_checkbox"/> <text name="name_tags_textbox"> @@ -45,7 +45,7 @@ <radio_item label="Brevemente" name="radio3" value="2"/> </radio_group> <check_box label="Mostrar meu nome" name="show_my_name_checkbox1"/> - <check_box initial_value="true" label="Nomes pequenos" name="small_avatar_names_checkbox"/> + <check_box initial_value="true" label="Nome curto" name="small_avatar_names_checkbox"/> <check_box label="Mostrar cargo" name="show_all_title_checkbox1"/> <text name="effects_color_textbox"> Meus efeitos: diff --git a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml index 7f6439d1e7..f03063d05b 100644 --- a/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml +++ b/indra/newview/skins/default/xui/pt/panel_preferences_setup.xml @@ -28,7 +28,7 @@ <text name="Cache location"> Localização do cache: </text> - <button label="Navegar" label_selected="Navegar" name="set_cache"/> + <button label="Procurar" label_selected="Procurar" name="set_cache"/> <button label="Redefinir" label_selected="Redefinir" name="reset_cache"/> <text name="Web:"> Web: @@ -45,5 +45,5 @@ Localização do proxy: </text> <line_editor name="web_proxy_editor" tool_tip="O nome ou endereço IP do proxy da sua preferência"/> - <spinner label="Número da porta:" name="web_proxy_port"/> + <spinner label="Porta:" name="web_proxy_port"/> </panel> diff --git a/indra/newview/skins/default/xui/pt/strings.xml b/indra/newview/skins/default/xui/pt/strings.xml index 393478de08..773aea5848 100644 --- a/indra/newview/skins/default/xui/pt/strings.xml +++ b/indra/newview/skins/default/xui/pt/strings.xml @@ -8,7 +8,7 @@ SECOND LIFE </string> <string name="SUPPORT_SITE"> - Portal de Apoio do Second Life + Portal de Supporte Second Life </string> <string name="StartupDetectingHardware"> Detectando hardware... @@ -32,7 +32,7 @@ Alterando a resolução... </string> <string name="LoginInProgress"> - Fazendo Login. [APP_NAME] pode parecer congelado. Por favor, aguarde. + Fazendo login. [APP_NAME] pode parecer congelado. Por favor, aguarde. </string> <string name="LoginInProgressNoFrozen"> Logando... @@ -44,7 +44,7 @@ Executando manutenção da conta... </string> <string name="LoginAttempt"> - Falha na tentativa anterior de login. Fazendo Login, tentativa [NUMBER] + Falha na tentativa anterior de login. Login, tentativa [NUMBER] </string> <string name="LoginPrecaching"> Carregando mundo... @@ -62,10 +62,10 @@ Verificando arquivos cache (pode levar de 60-90 segundos)... </string> <string name="LoginProcessingResponse"> - Processando Resposta... + Processando resposta... </string> <string name="LoginInitializingWorld"> - Inicializando Mundo... + Inicializando mundo... </string> <string name="LoginDecodingImages"> Decodificando imagens... @@ -74,13 +74,13 @@ Inicializando o QuickTime... </string> <string name="LoginQuicktimeNotFound"> - O QuickTime não foi encontrado - incapaz de inicializar. + O QuickTime não foi encontrado - falha ao iniciar. </string> <string name="LoginQuicktimeOK"> O QuickTime foi inicializado com sucesso. </string> <string name="LoginWaitingForRegionHandshake"> - Aguardando o handshake com a região... + Aguardando handshake com a região... </string> <string name="LoginConnectingToRegion"> Conectando à região... @@ -89,7 +89,7 @@ Baixando roupas... </string> <string name="LoginFailedNoNetwork"> - Erro de Rede: Não foi possível estabelecer a conexão, verifique sua conexão de rede. + Erro de rede: Não foi possível estabelecer a conexão, verifique sua conexão de rede. </string> <string name="LoginFailed"> Falha do login. @@ -143,22 +143,22 @@ Construído por Grupo </string> <string name="TooltipFlagNoBuild"> - Não é Permitido Construir + Não é permitido construir </string> <string name="TooltipFlagNoEdit"> Construído por Grupo </string> <string name="TooltipFlagNotSafe"> - Não é Seguro + Não é seguro </string> <string name="TooltipFlagNoFly"> - Não é Permitido Voar + Não é permitido voar </string> <string name="TooltipFlagGroupScripts"> Scripts de Grupo </string> <string name="TooltipFlagNoScripts"> - Não são Permitidos Scripts + Não são permitidos scripts </string> <string name="TooltipLand"> Terreno: @@ -167,10 +167,10 @@ Apenas um item único pode ser arrastado para este local </string> <string name="TooltipHttpUrl"> - Clique para ver essa página web + Clique para ver a página web </string> <string name="TooltipSLURL"> - Clique para ver a informação desta localização + Clique para ver os dados desta localização </string> <string name="TooltipAgentUrl"> Clique para ver o perfil deste residente @@ -200,7 +200,7 @@ Clique para ver a descrição deste evento </string> <string name="TooltipClassifiedUrl"> - Clique para ver este classificado + Clique para ver este anúncio </string> <string name="TooltipParcelUrl"> Clique para ver a descrição desta parcela @@ -215,7 +215,7 @@ Clique para ver esta localização no mapa </string> <string name="TooltipSLAPP"> - Clique para ativar no secondlife:// commando + Clique para ativar no secondlife:// comando </string> <string name="CurrentURL" value="URL atual: [CurrentURL]"/> <string name="TooltipPrice" value="L$[PRICE]-"/> @@ -274,7 +274,7 @@ Buscando... </string> <string name="ReleaseNotes"> - Notas de Distribuição + Notas de versão </string> <string name="LoadingData"> Carregando... @@ -343,7 +343,7 @@ objeto </string> <string name="note card"> - notecard + anotação </string> <string name="folder"> pasta @@ -430,7 +430,7 @@ Entediado </string> <string name="anim_bow"> - Saudar curvando + Reverência </string> <string name="anim_clap"> Aplaudir @@ -490,10 +490,10 @@ Impaciente </string> <string name="anim_jumpforjoy"> - Pular de Alegria + Pular de alegria </string> <string name="anim_kissmybutt"> - Beije meu Bumbum + Beije meu bumbum </string> <string name="anim_express_kiss"> Beijar @@ -514,7 +514,7 @@ Nya-nya-nya </string> <string name="anim_punch_onetwo"> - Soco Um-Dois + Soco um-dois </string> <string name="anim_express_open_mouth"> Abrir a boca @@ -529,10 +529,10 @@ Apontar para si </string> <string name="anim_punch_l"> - Socar Esquerda + Soco esquerdo </string> <string name="anim_punch_r"> - Socar Direita + Soco direito </string> <string name="anim_rps_countdown"> RPS contar @@ -571,16 +571,16 @@ Fumar à toa </string> <string name="anim_smoke_inhale"> - Inalar Fumaça + Inalar fumaça </string> <string name="anim_smoke_throw_down"> - Expelir Fumaça + Expelir fumaça </string> <string name="anim_express_surprise"> Surpresa </string> <string name="anim_sword_strike_r"> - Golpe de Espada + Golpe de espada </string> <string name="anim_angry_tantrum"> Enraivecer @@ -637,7 +637,7 @@ grita: </string> <string name="ringing"> - Conectando à conversa de Voz no mundo + Conectando à conversa de voz no mundo </string> <string name="connected"> Conectado @@ -691,13 +691,13 @@ Controle sua camera </string> <string name="SIM_ACCESS_PG"> - PG + Público geral </string> <string name="SIM_ACCESS_MATURE"> - Mature + Moderado </string> <string name="SIM_ACCESS_ADULT"> - Adult + Adulto </string> <string name="SIM_ACCESS_DOWN"> Desconectado @@ -709,7 +709,7 @@ (desconhecido) </string> <string name="all_files"> - Todos os Arquivos + Todos os arquivos </string> <string name="sound_files"> Sons @@ -733,10 +733,10 @@ Imagens Bitmap </string> <string name="avi_movie_file"> - Arquivo de filme AVI + Arquivo de vídeo AVI </string> <string name="xaf_animation_file"> - Arquivo de Animação XAF + Arquivo de animação XAF </string> <string name="xml_file"> Arquivo XML @@ -745,25 +745,25 @@ Arquivo RAW </string> <string name="compressed_image_files"> - Imagens Compactadas + Imagens compactadas </string> <string name="load_files"> - Carregar Arquivos + Carregar arquivos </string> <string name="choose_the_directory"> - Escolher Diretório + Selecionar pasta </string> <string name="AvatarSetNotAway"> - deixar como não away + deixar como ausente </string> <string name="AvatarSetAway"> - deixar como Away + deixar como ausente </string> <string name="AvatarSetNotBusy"> - deixar como não Ocupado + deixar como não ocupado </string> <string name="AvatarSetBusy"> - Deixar como Busy + Deixar como ocupado </string> <string name="shape"> Silhueta @@ -781,7 +781,7 @@ Camisa </string> <string name="pants"> - calças + Calças </string> <string name="shoes"> Sapatos @@ -796,22 +796,22 @@ Luvas </string> <string name="undershirt"> - camiseta + Camiseta </string> <string name="underpants"> - roupa debaixo + Roupa de baixo </string> <string name="skirt"> - saia + Saia </string> <string name="alpha"> Alpha </string> <string name="tattoo"> - Tattoo + Tatuagem </string> <string name="invalid"> - inválido + Inválido </string> <string name="NewWearable"> Novo [WEARABLE_ITEM] @@ -905,32 +905,32 @@ </string> <string name="WornOnAttachmentPoint" value="(vestido em [ATTACHMENT_POINT])"/> <string name="ActiveGesture" value="[GESLABEL] (ativado)"/> - <string name="Chat" value="Bate papo :"/> - <string name="Sound" value="Som :"/> - <string name="Wait" value="--- Aguarde :"/> - <string name="AnimFlagStop" value="Parar animação :"/> - <string name="AnimFlagStart" value="Iniciar animação :"/> - <string name="Wave" value="Aceno"/> + <string name="Chat" value="Bate papo"/> + <string name="Sound" value="Som"/> + <string name="Wait" value="--- Aguarde"/> + <string name="AnimFlagStop" value="Parar animação"/> + <string name="AnimFlagStart" value="Iniciar animação"/> + <string name="Wave" value="Acenar"/> <string name="HelloAvatar" value="Olá, avatar!"/> - <string name="ViewAllGestures" value="Ver tudo >>"/> + <string name="ViewAllGestures" value="Ver todos>>"/> <string name="Animations" value="Animações,"/> <string name="Calling Cards" value="Cartões de visitas,"/> <string name="Clothing" value="Vestuário,"/> <string name="Gestures" value="Gestos,"/> - <string name="Landmarks" value="Landmarks,"/> - <string name="Notecards" value="Notecards,"/> + <string name="Landmarks" value="Marcos"/> + <string name="Notecards" value="Anotações"/> <string name="Objects" value="Objetos,"/> <string name="Scripts" value="Scripts,"/> - <string name="Sounds" value="Sons,"/> - <string name="Textures" value="Texturas,"/> - <string name="Snapshots" value="Fotografias,"/> + <string name="Sounds" value="Sons"/> + <string name="Textures" value="Texturas"/> + <string name="Snapshots" value="Fotografias"/> <string name="No Filters" value="Não"/> - <string name="Since Logoff" value="- desde desligado"/> + <string name="Since Logoff" value="- Desde desligado"/> <string name="InvFolder My Inventory"> - Meu Inventorio + Meu inventário </string> <string name="InvFolder My Favorites"> - Meus Favoritos + Meus favoritos </string> <string name="InvFolder Library"> Biblioteca @@ -942,10 +942,10 @@ Sons </string> <string name="InvFolder Calling Cards"> - Cartões de Visitas + Cartões de visitas </string> <string name="InvFolder Landmarks"> - Landmarks + Marcos </string> <string name="InvFolder Scripts"> Scripts @@ -957,31 +957,31 @@ Objetos </string> <string name="InvFolder Notecards"> - Notecards + Anotações </string> <string name="InvFolder New Folder"> - Nova Pasta + Nova pasta </string> <string name="InvFolder Inventory"> Inventário </string> <string name="InvFolder Uncompressed Images"> - Imagens Descompactadas + Imagens descompactadas </string> <string name="InvFolder Body Parts"> - Partes do Corpo + Corpo </string> <string name="InvFolder Trash"> Lixo </string> <string name="InvFolder Photo Album"> - Álbum de Fotografias + Álbum de fotografias </string> <string name="InvFolder Lost And Found"> Achados e Perdidos </string> <string name="InvFolder Uncompressed Sounds"> - Sons Descompactados + Sons descompactados </string> <string name="InvFolder Animations"> Animações @@ -993,10 +993,10 @@ Favoritos </string> <string name="InvFolder Current Outfit"> - Vestimanta Atual + Look atual </string> <string name="InvFolder My Outfits"> - Minhas Vestimentas + Meus looks </string> <string name="InvFolder Accessories"> Acessórios @@ -1071,7 +1071,7 @@ Espinha </string> <string name="Pelvis"> - Pelvis + Pélvis </string> <string name="Mouth"> Boca @@ -1128,10 +1128,10 @@ Estômago </string> <string name="Left Pec"> - Pec esquerdo + Peitoral E </string> <string name="Right Pec"> - Pec direito + Peitoral D </string> <string name="YearsMonthsOld"> [AGEYEARS] [AGEMONTHS] de idade @@ -1209,19 +1209,19 @@ Empregado da Linden Lab </string> <string name="PaymentInfoUsed"> - Info de Pagamento usada + Dados de pagamento usados </string> <string name="PaymentInfoOnFile"> - Info de Pagamento no Arquivo + Dados de pagamento fornecidos </string> <string name="NoPaymentInfoOnFile"> - Nenhuma Info de Pagamento no Arquivo + Nenhum dado de pagamento </string> <string name="AgeVerified"> - Idade-verificada + Idade comprovada </string> <string name="NotAgeVerified"> - Idade não-verificada + Idade não comprovada </string> <string name="Center 2"> Centro 2 @@ -1248,16 +1248,16 @@ Inferior direito </string> <string name="CompileQueueDownloadedCompiling"> - Downloaded, agora compilando + Baixado, agora compilando </string> <string name="CompileQueueScriptNotFound"> Script não encontrado no servidor. </string> <string name="CompileQueueProblemDownloading"> - Problema no download + Problema no download </string> <string name="CompileQueueInsufficientPermDownload"> - Permissões insuficientes para fazer o download do script. + Permissões insuficientes para fazer o download do script. </string> <string name="CompileQueueInsufficientPermFor"> Permissões insuficientes para @@ -1266,7 +1266,7 @@ Falha desconhecida para download </string> <string name="CompileQueueTitle"> - Progresso do Recompilamento + Progresso do recompilamento </string> <string name="CompileQueueStart"> recompilar @@ -1275,7 +1275,7 @@ Reset Progresso </string> <string name="ResetQueueStart"> - reset + Zerar </string> <string name="RunQueueTitle"> Definir funcionamento do progresso @@ -1299,7 +1299,7 @@ Salvo. </string> <string name="ObjectOutOfRange"> - Script (objecto fora de alcance) + Script (objeto fora de alcance) </string> <string name="GodToolsObjectOwnedBy"> Objeto [OBJECT] de propriedade de [OWNER] @@ -1327,10 +1327,10 @@ Total </string> <string name="NoGroupDataFound"> - Não ha dados de grupo para o grupo + Não há dados de grupo </string> <string name="IMParentEstate"> - propriedade dos pais + Propriedade-pai </string> <string name="IMMainland"> continente @@ -1522,7 +1522,7 @@ Conteúdo do objeto </string> <string name="BusyModeResponseDefault"> - O residente para o qual escreveu está no modo 'ocupado', ou seja, ele prefere não receber nada no momento. Sua mensagem será exibida como uma MI mais tarde. + O residente para o qual escreveu está no modo 'ocupado', ou seja, ele prefere não receber nada no momento. Sua mensagem será exibida como uma MI mais tarde. </string> <string name="MuteByName"> (por nome) @@ -1537,10 +1537,10 @@ (grupo) </string> <string name="RegionNoCovenant"> - Não ha Contrato fornecido para essa Região. + Não foi definido um contrato para essa região. </string> <string name="RegionNoCovenantOtherOwner"> - Não ha Contrato fornecido para essa Região. O terreno nesta região está sendo vendido pelo Proprietário, não pela Linden Lab. Favor contatar o Proprietário da região para detalhes de venda. + Não foi definido um contrato para essa Região. O terreno nesta região está sendo vendido pelo Proprietário, não pela Linden Lab. Favor contatar o Proprietário da região para detalhes de venda. </string> <string name="covenant_last_modified"> Última modificação: @@ -1560,7 +1560,7 @@ (vai atualizar depois de publicado) </string> <string name="NoPicksClassifiedsText"> - Você não criou nenhum Destaque ou Anúncio. Clique no botão "+" para criar um Destaque ou Anúncio. + Você não criou nenhum Destaque ou Anúncio. Clique no botão "+" para criar um Destaque ou Anúncio. </string> <string name="NoAvatarPicksClassifiedsText"> O usuário não tem nenhum destaque ou anúncio @@ -1581,19 +1581,19 @@ possuído pelo grupo </string> <string name="InvOfferOwnedByUnknownGroup"> - possuído por um grupo desconhecido + de um grupo desconhecido </string> <string name="InvOfferOwnedBy"> - possuído por + de </string> <string name="InvOfferOwnedByUnknownUser"> - possuído por usuário desconhecido + de usuário desconhecido </string> <string name="InvOfferGaveYou"> deu a você </string> <string name="InvOfferYouDecline"> - Você declina + Você recusa </string> <string name="InvOfferFrom"> de @@ -1620,7 +1620,7 @@ pagou prêmio para o evento </string> <string name="GroupMoneyBalance"> - Balanço + Saldo </string> <string name="GroupMoneyCredits"> Créditos @@ -1651,10 +1651,10 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh Bloquear </string> <string name="AddLandmarkNavBarMenu"> - Adicionar Landmark... + Adicionar marco... </string> <string name="EditLandmarkNavBarMenu"> - Editar Landmark... + Editar marco... </string> <string name="accel-mac-control"> ⌃ @@ -1762,7 +1762,7 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh Locação Linden </string> <string name="Adult"> - Adult + Adulto </string> <string name="Arts&Culture"> Artes e Cultura @@ -1774,13 +1774,13 @@ Expected .wav, .tga, .bmp, .jpg, .jpeg, or .bvh Educacional </string> <string name="Gaming"> - Jogos + Games </string> <string name="Hangout"> Moradia </string> <string name="Newcomer Friendly"> - Amigável a Novos Usuários + Para recém-chegados </string> <string name="Parks&Nature"> Parques & Natureza @@ -1822,10 +1822,10 @@ Se a mensagem persistir, reinicie o computador e tente novamente. Se o error persistir, pode ser necessário desinstalar completamente [APP_NAME] e reinstalá-lo. </string> <string name="MBFatalError"> - Erro Fatal + Erro fatal </string> <string name="MBRequiresAltiVec"> - [APP_NAME] exige um processador com AltiVec (G4 ou superior). + [APP_NAME] exige processador com AltiVec (G4 ou superior). </string> <string name="MBAlreadyRunning"> [APP_NAME] já está em execução. @@ -1833,7 +1833,7 @@ Verifique a sua barra de tarefas para obter uma cópia do programa minimizado. Se a mensagem persistir, reinicie o computador. </string> <string name="MBFrozenCrashed"> - [APP_NAME] parece ter congelado ou falhado na execução anterior. Você gostaria de enviar um relatório de falha? + [APP_NAME] parece ter congelado ou falhado na execução anterior. Enviar relatório de falha? </string> <string name="MBAlert"> Alerta @@ -1887,7 +1887,7 @@ Também não se esqueça de definir seu monitor para True Color (32-bit), em pai Se você continuar a receber esta mensagem, contate o [SUPPORT_SITE]. </string> <string name="MBPixelFmtSetErr"> - ão é possível definir o formato de pixel + Não é possível definir o formato de pixel </string> <string name="MBGLContextErr"> Não é possível criar o contexto de renderização GL @@ -1901,7 +1901,7 @@ Se você continuar a receber esta mensagem, contate o [SUPPORT_SITE]. If you continue to receive this message, contact the [SUPPORT_SITE]. </string> <string name="5 O'Clock Shadow"> - Sombra descuidada + Barba por fazer </string> <string name="All White"> Todo branco @@ -1910,10 +1910,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Olhos de Anime </string> <string name="Arced"> - arqueado + Arqueados </string> <string name="Arm Length"> - Comprimento do Braço + Comprimento do braço </string> <string name="Attached"> Anexado @@ -1931,7 +1931,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Franja </string> <string name="Beady Eyes"> - Olhos malévolos + Olhos pequenos </string> <string name="Belly Size"> Tamanho da barriga @@ -1940,7 +1940,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Grande </string> <string name="Big Butt"> - Traseiro Grande + Bunda grande </string> <string name="Big Hair Back"> Cabelo volumoso: Trás @@ -1949,7 +1949,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Cabelo volumoso: Frente </string> <string name="Big Hair Top"> - cabelo volumoso: Topo + Cabelo volumoso: Topo </string> <string name="Big Head"> cabeça grande @@ -1958,7 +1958,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Peitorais grandes </string> <string name="Big Spikes"> - espinhos grandes + Pontas grandes </string> <string name="Black"> Negro @@ -1967,40 +1967,40 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Loiro </string> <string name="Blonde Hair"> - Cabelo Loiro + Cabelo loiro </string> <string name="Blush"> Blush </string> <string name="Blush Color"> - cor do Blush + Cor do blush </string> <string name="Blush Opacity"> - Opacidade do Blush + Opacidade do blush </string> <string name="Body Definition"> - definição do Corpo + Definição do corpo </string> <string name="Body Fat"> - Gordura corporal + Gordura </string> <string name="Body Freckles"> - Sardas do corpo + Sardas </string> <string name="Body Thick"> Corpo cheio </string> <string name="Body Thickness"> - Espessura do corpo + Ossatura </string> <string name="Body Thin"> Corpo magro </string> <string name="Bow Legged"> - pernas arqueadas + Pernas arqueadas </string> <string name="Breast Buoyancy"> - Flexibilidade dos seios + Caimento dos seios </string> <string name="Breast Cleavage"> Separação dos seios @@ -2015,7 +2015,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Largo </string> <string name="Brow Size"> - tamanho da sobrancelha + Tamanho da sobrancelha </string> <string name="Bug Eyes"> Olhos saltados @@ -2039,25 +2039,25 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Tamanho do traseiro </string> <string name="bustle skirt"> - Movimentação de saia + Saia armada </string> <string name="no bustle"> - Sem movimento + Saia reta </string> <string name="more bustle"> - Mais movimento + Mais </string> <string name="Chaplin"> Chaplin </string> <string name="Cheek Bones"> - Maças do rosto + Maçãs do rosto </string> <string name="Chest Size"> Tamanho do peito </string> <string name="Chin Angle"> - ângulo do queixo + Ângulo do queixo </string> <string name="Chin Cleft"> Fissura do queixo @@ -2105,7 +2105,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Direita fechada </string> <string name="Coin Purse"> - Pubis + Pouco volume </string> <string name="Collar Back"> Colarinho posterior @@ -2126,7 +2126,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Nariz torto </string> <string name="Cuff Flare"> - bainha larga + Bainha larga </string> <string name="Dark"> Escuro @@ -2135,13 +2135,13 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Verde escuro </string> <string name="Darker"> - mais escuro + Mais escuro </string> <string name="Deep"> Profundidade </string> <string name="Default Heels"> - Salto Padrão + Salto padrão </string> <string name="Dense"> Densidade @@ -2153,10 +2153,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Curvado para baixo </string> <string name="Duffle Bag"> - pubis + Mais volume </string> <string name="Ear Angle"> - ângulo da orelha + Ângulo da orelha </string> <string name="Ear Size"> Tamanho da orelha @@ -2183,7 +2183,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Abertura dos olhos </string> <string name="Eye Pop"> - Olho Saltado + Olho saltado </string> <string name="Eye Size"> Tamanho dos olhos @@ -2195,7 +2195,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Arco da sobrancelha </string> <string name="Eyebrow Density"> - densidade da sobrancelha + Densidade da sobrancelha </string> <string name="Eyebrow Height"> Altura da sobrancelha @@ -2258,7 +2258,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Tamanho dos pés </string> <string name="Forehead Angle"> - ângulo da testa + Ângulo da testa </string> <string name="Forehead Heavy"> Testa pronunciada @@ -2291,7 +2291,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Dedos da luva </string> <string name="Glove Length"> - comprimento das luvas + Comprimento das luvas </string> <string name="Hair"> Cabelo @@ -2330,7 +2330,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Tamanho das mãos </string> <string name="Handlebars"> - bigode + Bigode </string> <string name="Head Length"> Comprimento da cabeça @@ -2354,7 +2354,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Altura </string> <string name="High"> - alto + Alto </string> <string name="High Heels"> Salto alto @@ -2363,7 +2363,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Maxilar alto </string> <string name="High Platforms"> - Plataformas alta + Plataformas altas </string> <string name="High and Tight"> Alto e justo @@ -2399,7 +2399,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Comprimento da blusa </string> <string name="Jacket Wrinkles"> - Dobras da Blusa + Dobras da jaqueta </string> <string name="Jaw Angle"> Ângulo da mandíbula @@ -2441,7 +2441,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Menos </string> <string name="Less Body Fat"> - Menos gordura corporal + Menos gordura </string> <string name="Less Curtains"> Menos barba @@ -2456,7 +2456,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Menos gravidade </string> <string name="Less Love"> - Menos cintura + Menos excesso </string> <string name="Less Muscles"> Menos músculos @@ -2489,7 +2489,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Fenda dos lábios </string> <string name="Lip Cleft Depth"> - Prfundidade da fenda dos lábios + Profundidade da fenda dos lábios </string> <string name="Lip Fullness"> Volume dos lábios @@ -2546,37 +2546,37 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Pantalonas </string> <string name="Loose Shirt"> - Saia folgada + Camisa folgada </string> <string name="Loose Sleeves"> - Manga longa + Mangas folgadas </string> <string name="Love Handles"> Pneu </string> <string name="Low"> - baixo + Baixo </string> <string name="Low Heels"> Salto baixo </string> <string name="Low Jaw"> - maxilar baixo + Maxilar baixo </string> <string name="Low Platforms"> Plataformas baixas </string> <string name="Low and Loose"> - baixo e solto + Baixo e solto </string> <string name="Lower"> - diminuir + Mais baixo </string> <string name="Lower Bridge"> - nariz baixo + Mais baixa </string> <string name="Lower Cheeks"> - bochechas abaixadas + Bochechas abaixadas </string> <string name="Male"> Masculino @@ -2591,7 +2591,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Mais blush </string> <string name="More Body Fat"> - Mais gordura corporal + Mais gordura </string> <string name="More Curtains"> Mais barba @@ -2645,7 +2645,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Mais vertical </string> <string name="More Volume"> - Mais Volume + Mais volume </string> <string name="More soul"> Mais alma @@ -2696,16 +2696,16 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Espessura do pescoço </string> <string name="No Blush"> - Sem Blush + Sem blush </string> <string name="No Eyeliner"> Sem delineador </string> <string name="No Eyeshadow"> - Sem Sombra dos olhos + Sem sombra </string> <string name="No Lipgloss"> - Sem brilho labial + Sem brilho </string> <string name="No Lipstick"> Sem batom @@ -2720,7 +2720,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Sem vermelho </string> <string name="No Spikes"> - Sem espinhos + Sem pontas </string> <string name="No White"> Sem branco @@ -2801,10 +2801,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Sombra externa </string> <string name="Overbite"> - Overbite + Má oclusão </string> <string name="Package"> - Pubis + Púbis </string> <string name="Painted Nails"> Unhas pintadas @@ -2816,7 +2816,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Cavalo da calça </string> <string name="Pants Fit"> - Pants Fit + Caimento das calças </string> <string name="Pants Length"> Comprimento das calças @@ -2831,10 +2831,10 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Parte </string> <string name="Part Bangs"> - Parts da franja + Divisão da franja </string> <string name="Pectorals"> - Peitoral + Peitorais </string> <string name="Pigment"> Pigmento @@ -2879,7 +2879,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Pálpebras inchadas </string> <string name="Rainbow Color"> - Cor do arco iris + Cor do arco íris </string> <string name="Red Hair"> Cabelo ruivo @@ -2906,7 +2906,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Cabelo desalinhado </string> <string name="Saddle Bags"> - Saddle Bags + Culote </string> <string name="Scrawny Leg"> Pernas magricelas @@ -2915,7 +2915,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Separar </string> <string name="Shallow"> - raso + Raso </string> <string name="Shear Back"> Trás rente @@ -2939,22 +2939,22 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Rente frente </string> <string name="Shift Left"> - Deslocar à esquerda + Deslocar p/ esquerda </string> <string name="Shift Mouth"> Deslocar boca </string> <string name="Shift Right"> - Deslocar direita + Deslocar p/ direita </string> <string name="Shirt Bottom"> - Deslocar inferior + Barra da camisa </string> <string name="Shirt Fit"> - Deslocar ajuste + Ajuste da camisa </string> <string name="Shirt Wrinkles"> - Deslocar dobras + +/- amassada </string> <string name="Shoe Height"> Altura do sapato @@ -3218,7 +3218,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Ver mais informações sobre a localização atual </string> <string name="LocationCtrlComboBtnTooltip"> - Meu histórico de localizações + Histórico de localizações </string> <string name="UpdaterWindowTitle"> [APP_NAME] Atualização @@ -3418,7 +3418,7 @@ If you continue to receive this message, contact the [SUPPORT_SITE]. Denunciar abuso </string> <string name="New Shape"> - Nova silhueta + Nova forma </string> <string name="New Skin"> Nova pele diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py index 3f379fcf75..18ac10fe38 100755 --- a/indra/newview/viewer_manifest.py +++ b/indra/newview/viewer_manifest.py @@ -479,8 +479,8 @@ class WindowsManifest(ViewerManifest): grid_vars_template = """ OutFile "%(installer_file)s" !define INSTFLAGS "%(flags)s" - !define INSTNAME "SecondLife" - !define SHORTCUT "Second Life" + !define INSTNAME "SecondLifeViewer2" + !define SHORTCUT "Second Life Viewer 2" !define URLNAME "secondlife" Caption "Second Life ${VERSION}" """ @@ -686,7 +686,7 @@ class DarwinManifest(ViewerManifest): def package_finish(self): - channel_standin = 'Second Life' # hah, our default channel is not usable on its own + channel_standin = 'Second Life Viewer 2' # hah, our default channel is not usable on its own if not self.default_channel(): channel_standin = self.channel() |