From d0e96bf4b2720ed8177b323e12cadb4e65d7171d Mon Sep 17 00:00:00 2001 From: "Nyx (Neal Orman)" Date: Tue, 9 Feb 2010 17:43:16 -0500 Subject: EXT-4569 alpha preview not working after alpha is saved We were setting the baked texture ID to IMG_INVISIBLE when hitting the save button on the appearance editor to force the right texture IDs to be sent to surrounding viewers. Now, when you make a change after it is saved, it clears this texture ID. This restores expected functionality. Code reviewed by bigpapi. -Nyx --- indra/newview/llvoavatarself.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/indra/newview/llvoavatarself.cpp b/indra/newview/llvoavatarself.cpp index 13e28b246a..00998b300a 100644 --- a/indra/newview/llvoavatarself.cpp +++ b/indra/newview/llvoavatarself.cpp @@ -932,6 +932,13 @@ void LLVOAvatarSelf::wearableUpdated( EWearableType type, BOOL upload_result ) { const LLVOAvatarDictionary::BakedEntry *baked_dict = baked_iter->second; const LLVOAvatarDefines::EBakedTextureIndex index = baked_iter->first; + + // if we're editing our appearance, ensure that we're not using baked textures + // The baked texture for alpha masks is set explicitly when you hit "save" + if (gAgent.cameraCustomizeAvatar()) + { + setNewBakedTexture(index,IMG_DEFAULT_AVATAR); + } if (baked_dict) { for (LLVOAvatarDefines::wearables_vec_t::const_iterator type_iter = baked_dict->mWearables.begin(); -- cgit v1.2.3 From bef6944ce123c67c29ea3dd27c9ae1597627e154 Mon Sep 17 00:00:00 2001 From: "Eric M. Tulla (BigPapi)" Date: Tue, 9 Feb 2010 18:00:33 -0500 Subject: EXT-3980 - Closed folders were being reexpanded unnecessarily during inventory search. We now only update the open/closed status when we've updated the filter status. -Reviewed by Richard --- indra/newview/llfolderviewitem.cpp | 4 ---- 1 file changed, 4 deletions(-) diff --git a/indra/newview/llfolderviewitem.cpp b/indra/newview/llfolderviewitem.cpp index f154de39c9..20cb2d3604 100644 --- a/indra/newview/llfolderviewitem.cpp +++ b/indra/newview/llfolderviewitem.cpp @@ -1339,10 +1339,6 @@ void LLFolderViewFolder::filter( LLInventoryFilter& filter) if (folder->getFiltered() || folder->hasFilteredDescendants(filter.getMinRequiredGeneration())) { mMostFilteredDescendantGeneration = filter_generation; - if (getRoot()->needsAutoSelect() && autoopen_folders) - { - folder->setOpenArrangeRecursively(TRUE); - } } // just skip it, it has already been filtered continue; -- cgit v1.2.3 From 465a3356a2f32362837d5231a21b9151f45f890b Mon Sep 17 00:00:00 2001 From: Erica Date: Tue, 9 Feb 2010 15:08:11 -0800 Subject: returning take to top level of object context menu. Change was mistakenly reverted --- indra/newview/skins/default/xui/en/menu_object.xml | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/indra/newview/skins/default/xui/en/menu_object.xml b/indra/newview/skins/default/xui/en/menu_object.xml index 5a9509e284..d66818e91a 100644 --- a/indra/newview/skins/default/xui/en/menu_object.xml +++ b/indra/newview/skins/default/xui/en/menu_object.xml @@ -86,16 +86,6 @@ - - - - + + + + Date: Tue, 9 Feb 2010 15:55:33 -0800 Subject: EXT-4449 [BSI] Zoom In does not function properly on large or linked prim sets reviewed by Richard CC#99 --- indra/newview/llagent.cpp | 2 ++ indra/newview/llviewermenu.cpp | 13 +++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/indra/newview/llagent.cpp b/indra/newview/llagent.cpp index 2354323a66..a061744f7c 100644 --- a/indra/newview/llagent.cpp +++ b/indra/newview/llagent.cpp @@ -4482,7 +4482,9 @@ void LLAgent::setCameraPosAndFocusGlobal(const LLVector3d& camera_pos, const LLV { const F64 ANIM_METERS_PER_SECOND = 10.0; const F64 MIN_ANIM_SECONDS = 0.5; + const F64 MAX_ANIM_SECONDS = 10.0; F64 anim_duration = llmax( MIN_ANIM_SECONDS, sqrt(focus_delta_squared) / ANIM_METERS_PER_SECOND ); + anim_duration = llmin( anim_duration, MAX_ANIM_SECONDS ); setAnimationDuration( (F32)anim_duration ); } diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index a83baf7f9a..6bf9c993e0 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -5332,7 +5332,7 @@ class LLWorldCreateLandmark : public view_listener_t void handle_look_at_selection(const LLSD& param) { - const F32 PADDING_FACTOR = 2.f; + const F32 PADDING_FACTOR = 1.75f; BOOL zoom = (param.asString() == "zoom"); if (!LLSelectMgr::getInstance()->getSelection()->isEmpty()) { @@ -5352,14 +5352,19 @@ void handle_look_at_selection(const LLSD& param) } if (zoom) { + // Make sure we are not increasing the distance between the camera and object + LLVector3d orig_distance = gAgent.getCameraPositionGlobal() - LLSelectMgr::getInstance()->getSelectionCenterGlobal(); + distance = llmin(distance, (F32) orig_distance.length()); + gAgent.setCameraPosAndFocusGlobal(LLSelectMgr::getInstance()->getSelectionCenterGlobal() + LLVector3d(obj_to_cam * distance), - LLSelectMgr::getInstance()->getSelectionCenterGlobal(), - object_id ); + LLSelectMgr::getInstance()->getSelectionCenterGlobal(), + object_id ); + } else { gAgent.setFocusGlobal( LLSelectMgr::getInstance()->getSelectionCenterGlobal(), object_id ); - } + } } } -- cgit v1.2.3 From c0d361ca3e2acd23b4470e289208e77e0af6c983 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Tue, 9 Feb 2010 17:45:43 -0800 Subject: more for EXT-4352: texture problem in viewer 2.0. TEXTURE_CACHE_ENTRY_SIZE does not match the FIRST_PACKET_SIZE on the sim side. --- indra/newview/lltexturecache.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/indra/newview/lltexturecache.cpp b/indra/newview/lltexturecache.cpp index a7f26f1df1..91c303c79e 100644 --- a/indra/newview/lltexturecache.cpp +++ b/indra/newview/lltexturecache.cpp @@ -51,7 +51,8 @@ // cache/textures/[0-F]/UUID.texture // Actual texture body files -const S32 TEXTURE_CACHE_ENTRY_SIZE = 1024; +//note: there is no good to define 1024 for TEXTURE_CACHE_ENTRY_SIZE while FIRST_PACKET_SIZE is 600 on sim side. +const S32 TEXTURE_CACHE_ENTRY_SIZE = FIRST_PACKET_SIZE;//1024; const F32 TEXTURE_CACHE_PURGE_AMOUNT = .20f; // % amount to reduce the cache by when it exceeds its limit const F32 TEXTURE_CACHE_LRU_SIZE = .10f; // % amount for LRU list (low overhead to regenerate) -- cgit v1.2.3 From 1940347ce08896bcd8a0252e61fff1547fa573b2 Mon Sep 17 00:00:00 2001 From: Xiaohong Bao Date: Tue, 9 Feb 2010 18:09:43 -0800 Subject: change some llassert_always to llassert in llviewertexture.cpp --- indra/newview/llviewertexture.cpp | 58 +++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 29 deletions(-) diff --git a/indra/newview/llviewertexture.cpp b/indra/newview/llviewertexture.cpp index 051e1330d5..9893eb5dce 100644 --- a/indra/newview/llviewertexture.cpp +++ b/indra/newview/llviewertexture.cpp @@ -715,7 +715,7 @@ void LLViewerTexture::generateGLTexture() LLImageGL* LLViewerTexture::getGLTexture() const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep ; } @@ -732,7 +732,7 @@ BOOL LLViewerTexture::createGLTexture() BOOL LLViewerTexture::createGLTexture(S32 discard_level, const LLImageRaw* imageraw, S32 usename, BOOL to_create, S32 category) { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; BOOL ret = mGLTexturep->createGLTexture(discard_level, imageraw, usename, to_create, category) ; @@ -748,55 +748,55 @@ BOOL LLViewerTexture::createGLTexture(S32 discard_level, const LLImageRaw* image void LLViewerTexture::setExplicitFormat(LLGLint internal_format, LLGLenum primary_format, LLGLenum type_format, BOOL swap_bytes) { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; mGLTexturep->setExplicitFormat(internal_format, primary_format, type_format, swap_bytes) ; } void LLViewerTexture::setAddressMode(LLTexUnit::eTextureAddressMode mode) { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; mGLTexturep->setAddressMode(mode) ; } void LLViewerTexture::setFilteringOption(LLTexUnit::eTextureFilterOptions option) { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; mGLTexturep->setFilteringOption(option) ; } //virtual S32 LLViewerTexture::getWidth(S32 discard_level) const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->getWidth(discard_level) ; } //virtual S32 LLViewerTexture::getHeight(S32 discard_level) const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->getHeight(discard_level) ; } S32 LLViewerTexture::getMaxDiscardLevel() const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->getMaxDiscardLevel() ; } S32 LLViewerTexture::getDiscardLevel() const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->getDiscardLevel() ; } S8 LLViewerTexture::getComponents() const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->getComponents() ; } LLGLuint LLViewerTexture::getTexName() const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->getTexName() ; } @@ -821,124 +821,124 @@ BOOL LLViewerTexture::getBoundRecently() const LLTexUnit::eTextureType LLViewerTexture::getTarget(void) const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->getTarget() ; } BOOL LLViewerTexture::setSubImage(const LLImageRaw* imageraw, S32 x_pos, S32 y_pos, S32 width, S32 height) { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->setSubImage(imageraw, x_pos, y_pos, width, height) ; } BOOL LLViewerTexture::setSubImage(const U8* datap, S32 data_width, S32 data_height, S32 x_pos, S32 y_pos, S32 width, S32 height) { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->setSubImage(datap, data_width, data_height, x_pos, y_pos, width, height) ; } void LLViewerTexture::setGLTextureCreated (bool initialized) { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; mGLTexturep->setGLTextureCreated (initialized) ; } void LLViewerTexture::setCategory(S32 category) { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; mGLTexturep->setCategory(category) ; } LLTexUnit::eTextureAddressMode LLViewerTexture::getAddressMode(void) const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->getAddressMode() ; } S32 LLViewerTexture::getTextureMemory() const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->mTextureMemory ; } LLGLenum LLViewerTexture::getPrimaryFormat() const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->getPrimaryFormat() ; } BOOL LLViewerTexture::getIsAlphaMask() const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->getIsAlphaMask() ; } BOOL LLViewerTexture::getMask(const LLVector2 &tc) { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->getMask(tc) ; } F32 LLViewerTexture::getTimePassedSinceLastBound() { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->getTimePassedSinceLastBound() ; } BOOL LLViewerTexture::getMissed() const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->getMissed() ; } BOOL LLViewerTexture::isJustBound() const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->isJustBound() ; } void LLViewerTexture::forceUpdateBindStats(void) const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->forceUpdateBindStats() ; } U32 LLViewerTexture::getTexelsInAtlas() const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->getTexelsInAtlas() ; } U32 LLViewerTexture::getTexelsInGLTexture() const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->getTexelsInGLTexture() ; } BOOL LLViewerTexture::isGLTextureCreated() const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->isGLTextureCreated() ; } S32 LLViewerTexture::getDiscardLevelInAtlas() const { - llassert_always(mGLTexturep.notNull()) ; + llassert(mGLTexturep.notNull()) ; return mGLTexturep->getDiscardLevelInAtlas() ; } -- cgit v1.2.3 From e180c5f2048d163fa5180ef79b7c6d7428f0b65d Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 9 Feb 2010 21:21:11 -0500 Subject: EXT-4602 : Copying folders doesn't work Folders are back to being no longer copyable. --- indra/newview/llinventorybridge.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/indra/newview/llinventorybridge.cpp b/indra/newview/llinventorybridge.cpp index f246b6b529..035b2a12ee 100644 --- a/indra/newview/llinventorybridge.cpp +++ b/indra/newview/llinventorybridge.cpp @@ -1527,7 +1527,7 @@ BOOL LLFolderBridge::isUpToDate() const BOOL LLFolderBridge::isItemCopyable() const { - return TRUE; + return FALSE; } BOOL LLFolderBridge::copyToClipboard() const -- cgit v1.2.3 From 21020ef48031a15b751ed5c66dafafda066f5487 Mon Sep 17 00:00:00 2001 From: Loren Shih Date: Tue, 9 Feb 2010 21:22:37 -0500 Subject: EXT-3071 : CTRL+I should bring up either inventorySP or inventory floater EXT-5239 : Consider removing CTRL+I to spawn multiple inventory windows BTEST-42 : Can't hide inventory by pressing CTRL+I CTRL+I will now either open the inventory sidepanel, or close the sidepanel. --- indra/newview/llviewermenu.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/indra/newview/llviewermenu.cpp b/indra/newview/llviewermenu.cpp index 6bf9c993e0..8aae90ec3c 100644 --- a/indra/newview/llviewermenu.cpp +++ b/indra/newview/llviewermenu.cpp @@ -5630,14 +5630,15 @@ class LLShowSidetrayPanel : public view_listener_t bool handleEvent(const LLSD& userdata) { std::string panel_name = userdata.asString(); - // Open up either the sidepanel or new floater. - if (LLSideTray::getInstance()->isPanelActive(panel_name)) + // Toggle the panel + if (!LLSideTray::getInstance()->isPanelActive(panel_name)) { - LLFloaterInventory::showAgentInventory(); + // LLFloaterInventory::showAgentInventory(); + LLSideTray::getInstance()->showPanel(panel_name, LLSD()); } else { - LLSideTray::getInstance()->showPanel(panel_name, LLSD()); + LLSideTray::getInstance()->collapseSideBar(); } return true; } -- cgit v1.2.3 From 22dccc74a8fbcf3231d932db39781727833b9259 Mon Sep 17 00:00:00 2001 From: Eli Linden Date: Tue, 9 Feb 2010 19:38:19 -0800 Subject: DEV-43688 Cycle3 JA massive linguistic changes by Rika for better UI, post truncation fix --- .../skins/default/xui/ja/floater_about_land.xml | 36 +++++++++---------- .../default/xui/ja/floater_animation_preview.xml | 8 ++--- .../default/xui/ja/floater_avatar_textures.xml | 2 +- .../skins/default/xui/ja/floater_build_options.xml | 2 +- .../skins/default/xui/ja/floater_bulk_perms.xml | 8 ++--- .../skins/default/xui/ja/floater_buy_contents.xml | 12 +++---- .../skins/default/xui/ja/floater_buy_currency.xml | 2 +- .../skins/default/xui/ja/floater_buy_land.xml | 16 ++++----- .../skins/default/xui/ja/floater_buy_object.xml | 10 +++--- .../skins/default/xui/ja/floater_camera.xml | 2 +- .../skins/default/xui/ja/floater_color_picker.xml | 2 +- .../skins/default/xui/ja/floater_critical.xml | 4 +-- .../skins/default/xui/ja/floater_customize.xml | 8 ++--- .../skins/default/xui/ja/floater_image_preview.xml | 6 ++-- .../skins/default/xui/ja/floater_inspect.xml | 8 ++--- .../skins/default/xui/ja/floater_inventory.xml | 2 +- .../xui/ja/floater_inventory_view_finder.xml | 2 +- .../skins/default/xui/ja/floater_land_holdings.xml | 8 ++--- indra/newview/skins/default/xui/ja/floater_map.xml | 2 +- .../skins/default/xui/ja/floater_media_browser.xml | 4 +-- .../skins/default/xui/ja/floater_mem_leaking.xml | 6 ++-- .../skins/default/xui/ja/floater_perm_prefs.xml | 4 +-- .../skins/default/xui/ja/floater_postcard.xml | 8 ++--- .../skins/default/xui/ja/floater_preferences.xml | 2 +- .../default/xui/ja/floater_preview_animation.xml | 4 +-- .../default/xui/ja/floater_preview_gesture.xml | 2 +- .../skins/default/xui/ja/floater_preview_sound.xml | 4 +-- .../skins/default/xui/ja/floater_report_abuse.xml | 8 ++--- .../skins/default/xui/ja/floater_sell_land.xml | 2 +- .../skins/default/xui/ja/floater_snapshot.xml | 8 ++--- .../skins/default/xui/ja/floater_sound_preview.xml | 2 +- .../skins/default/xui/ja/floater_telehub.xml | 2 +- .../skins/default/xui/ja/floater_texture_ctrl.xml | 6 ++-- .../newview/skins/default/xui/ja/floater_tools.xml | 40 +++++++++++----------- .../skins/default/xui/ja/floater_window_size.xml | 2 +- .../skins/default/xui/ja/floater_world_map.xml | 22 ++++++------ .../skins/default/xui/ja/menu_avatar_self.xml | 2 +- .../default/xui/ja/menu_inspect_self_gear.xml | 2 +- .../skins/default/xui/ja/menu_inventory.xml | 10 +++--- indra/newview/skins/default/xui/ja/menu_login.xml | 2 +- indra/newview/skins/default/xui/ja/menu_object.xml | 4 +-- .../skins/default/xui/ja/menu_people_groups.xml | 2 +- indra/newview/skins/default/xui/ja/menu_slurl.xml | 2 +- indra/newview/skins/default/xui/ja/menu_viewer.xml | 12 +++---- indra/newview/skins/default/xui/ja/mime_types.xml | 10 +++--- .../skins/default/xui/ja/panel_bottomtray.xml | 4 +-- .../newview/skins/default/xui/ja/panel_friends.xml | 16 ++++----- .../default/xui/ja/panel_group_control_panel.xml | 2 +- .../skins/default/xui/ja/panel_group_general.xml | 2 +- .../skins/default/xui/ja/panel_group_invite.xml | 2 +- .../default/xui/ja/panel_group_land_money.xml | 2 +- .../skins/default/xui/ja/panel_group_notices.xml | 8 ++--- .../newview/skins/default/xui/ja/panel_groups.xml | 6 ++-- .../skins/default/xui/ja/panel_landmark_info.xml | 2 +- .../skins/default/xui/ja/panel_landmarks.xml | 6 ++-- .../skins/default/xui/ja/panel_main_inventory.xml | 10 +++--- .../xui/ja/panel_media_settings_general.xml | 2 +- .../xui/ja/panel_media_settings_security.xml | 2 +- .../skins/default/xui/ja/panel_my_profile.xml | 2 +- .../skins/default/xui/ja/panel_navigation_bar.xml | 4 +-- indra/newview/skins/default/xui/ja/panel_notes.xml | 6 ++-- .../default/xui/ja/panel_outfits_inventory.xml | 8 ++--- .../newview/skins/default/xui/ja/panel_people.xml | 22 ++++++------ indra/newview/skins/default/xui/ja/panel_picks.xml | 6 ++-- .../skins/default/xui/ja/panel_place_profile.xml | 7 ++-- .../default/xui/ja/panel_preferences_alerts.xml | 4 +-- .../default/xui/ja/panel_preferences_chat.xml | 18 +++++----- .../default/xui/ja/panel_preferences_general.xml | 2 +- .../default/xui/ja/panel_preferences_graphics1.xml | 2 +- .../default/xui/ja/panel_preferences_privacy.xml | 6 ++-- .../newview/skins/default/xui/ja/panel_profile.xml | 8 ++--- .../skins/default/xui/ja/panel_region_covenant.xml | 4 +-- .../skins/default/xui/ja/panel_region_debug.xml | 14 ++++---- .../skins/default/xui/ja/panel_region_estate.xml | 2 +- .../skins/default/xui/ja/panel_region_general.xml | 12 +++---- .../default/xui/ja/panel_region_general_layout.xml | 8 ++--- .../skins/default/xui/ja/panel_status_bar.xml | 2 +- indra/newview/skins/default/xui/ja/strings.xml | 18 +++++----- 78 files changed, 266 insertions(+), 265 deletions(-) diff --git a/indra/newview/skins/default/xui/ja/floater_about_land.xml b/indra/newview/skins/default/xui/ja/floater_about_land.xml index 49486d791a..b3278a8f9e 100644 --- a/indra/newview/skins/default/xui/ja/floater_about_land.xml +++ b/indra/newview/skins/default/xui/ja/floater_about_land.xml @@ -206,7 +206,7 @@ [MAX]の内[COUNT]（[DELETED]を削除） - 地域オブジェクトボーナス要因: [BONUS] + オブジェクトボーナス: [BONUS] プリム使用状況： @@ -263,7 +263,7 @@ オブジェクトのオーナー： -