From f644e28cfa0563ef508b848930f1adccbceba295 Mon Sep 17 00:00:00 2001 From: thickbrick Date: Sat, 28 May 2011 18:24:00 +0300 Subject: Allow prim sizes up to 64m on SL-Mesh regions This Abuses the existance of both GetMesh and ObjectAdd capabilities to detect SL-Mesh (same way it is done in viewer-development.) --- linden/indra/newview/hippolimits.cpp | 20 ++++++++++++++++++-- linden/indra/newview/hippolimits.h | 1 + linden/indra/newview/llviewermessage.cpp | 4 ++-- linden/indra/newview/llviewerregion.cpp | 2 ++ 4 files changed, 23 insertions(+), 4 deletions(-) (limited to 'linden/indra/newview') diff --git a/linden/indra/newview/hippolimits.cpp b/linden/indra/newview/hippolimits.cpp index bb2e805..2990a45 100644 --- a/linden/indra/newview/hippolimits.cpp +++ b/linden/indra/newview/hippolimits.cpp @@ -8,7 +8,8 @@ #include "llviewercontrol.h" #include - +#include "llagent.h" +#include "llviewerregion.h" HippoLimits *gHippoLimits = 0; @@ -90,7 +91,7 @@ void HippoLimits::setSecondLifeLimits() S32 max_groups = gHippoGridManager->getConnectedGrid()->getMaxAgentGroups(); mMaxAgentGroups = llmax(max_groups, 25); - mMaxPrimScale = 10.0f; + setSecondLifeMaxPrimScale(); mMinPrimScale = 0.01f; mMaxHeight = 4096.0f; mMinHoleSize = 0.05f; @@ -115,6 +116,21 @@ void HippoLimits::setSecondLifeLimits() mVoiceConnector = "SLVoice"; } +void HippoLimits::setSecondLifeMaxPrimScale() +{ + // SecondLife Mesh sims that allow 64m prims are ones that have BOTH these caps + if (gAgent.getRegion() + && !gAgent.getRegion()->getCapability("GetMesh").empty() + && !gAgent.getRegion()->getCapability("ObjectAdd").empty()) + { + mMaxPrimScale = 64.f; + } + else + { + mMaxPrimScale = 10.f; + } +} + F32 HippoLimits::getMaxPrimScale() const { if (gSavedSettings.getBOOL("DisableMaxBuildConstraints") && !mEnforceMaxBuild) diff --git a/linden/indra/newview/hippolimits.h b/linden/indra/newview/hippolimits.h index 9d6b2f6..d63d1b0 100644 --- a/linden/indra/newview/hippolimits.h +++ b/linden/indra/newview/hippolimits.h @@ -64,6 +64,7 @@ public: private: void setOpenSimLimits(); void setSecondLifeLimits(); + void setSecondLifeMaxPrimScale(); }; diff --git a/linden/indra/newview/llviewermessage.cpp b/linden/indra/newview/llviewermessage.cpp index f67f0dc..32d7172 100755 --- a/linden/indra/newview/llviewermessage.cpp +++ b/linden/indra/newview/llviewermessage.cpp @@ -3828,10 +3828,10 @@ void process_agent_movement_complete(LLMessageSystem* msg, void**) return; } + gHippoLimits->setLimits(); + if (!gLastVersionChannel.empty()) { - gHippoLimits->setLimits(); - if (gSavedSettings.getBOOL("ServerVersionChangedChat")) { LLStringUtil::format_map_t args; diff --git a/linden/indra/newview/llviewerregion.cpp b/linden/indra/newview/llviewerregion.cpp index eba0db7..a43e0c0 100644 --- a/linden/indra/newview/llviewerregion.cpp +++ b/linden/indra/newview/llviewerregion.cpp @@ -1439,12 +1439,14 @@ void LLViewerRegion::setSeedCapability(const std::string& url) capabilityNames.append("FetchLibDescendents"); capabilityNames.append("GetDisplayNames"); capabilityNames.append("SetDisplayName"); + capabilityNames.append("GetMesh"); // lets us know if this is a SL-Mesh region capabilityNames.append("GetTexture"); capabilityNames.append("GroupProposalBallot"); capabilityNames.append("HomeLocation"); capabilityNames.append("MapLayer"); capabilityNames.append("MapLayerGod"); capabilityNames.append("NewFileAgentInventory"); + capabilityNames.append("ObjectAdd"); // lets us know if this is a SL-Mesh region capabilityNames.append("ParcelPropertiesUpdate"); capabilityNames.append("ParcelMediaURLFilterList"); capabilityNames.append("ParcelNavigateMedia"); -- cgit v1.1 From e360acbf2a1c71c9652b0fafb1f934476ddbca9e Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Mon, 6 Jun 2011 03:22:59 -0500 Subject: Enable SaveSearchResults by default. Most users will want this, the only downside is some SLPlugin instances idling in the background. --- linden/indra/newview/app_settings/settings.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'linden/indra/newview') diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml index 1ada9f8..e571988 100644 --- a/linden/indra/newview/app_settings/settings.xml +++ b/linden/indra/newview/app_settings/settings.xml @@ -1002,7 +1002,7 @@ Type Boolean Value - 0 + 1 ShowLookAtNames -- cgit v1.1 From 5665fe9d7dfb2a6b3a9d21ca6bbedadbb30b7f35 Mon Sep 17 00:00:00 2001 From: Armin Weatherwax Date: Tue, 7 Jun 2011 01:14:59 +0200 Subject: add lots of people and several viewers to the credits in floater_about.xml --- linden/indra/newview/skins/default/xui/en-us/floater_about.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'linden/indra/newview') diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml index 863992c..91a63eb 100644 --- a/linden/indra/newview/skins/default/xui/en-us/floater_about.xml +++ b/linden/indra/newview/skins/default/xui/en-us/floater_about.xml @@ -35,16 +35,17 @@ max_length="65536" mouse_opaque="true" name="credits_editor" width="423" word_wrap="true"> The Imprudence Viewer was rocked hard by: - Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, and CodeBastard Redgrave. + Jacek Antonelli, McCabe Maxsted, Armin Weatherwax, Elektra Hesse, CodeBastard Redgrave and Boroondas Gupte. + http://kokuaviewer.org/ Imprudence is so awesome thanks to contributions from many generous people: - For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Archimedies Plutonian, Angus Boyd, Ansariel Hiller, Ardy Lay, Asuka Neely, Balp Allen, Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Felix Duesenburg, Geneko Nemeth, Henri Beauchamp, Katharine Berry, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Patrick Sapinski, Paul Churchill, Peter Lameth, Robin Cornelius, Stephen Zenith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, Zi Ree, and Zwagoth Klaar. + For their patches and code contributions, we thank Admiral Admiral, Aimee Trescothick, Aleric Inglewood, Alissa Sabre, Angus Boyd, Ansariel Hiller, Archimedies Plutonian, Ardy Lay, Asuka Neely, Balp Allen, Carjay McGinnis, Chalice Yao, Dale Glass, Damian Delacrois, Danny Nolan, Eryn, Felix Duesenburg, Frederick Martian, Geneko Nemeth, Grandma Bates, Hazim Gazov, Henri Beauchamp, Hg Beeks, Hiroshi Kumaki, Kakurady Drakenar, Katharine Berry, KirstenLee Cinquetti, Kitty Barnett, Latif Khalifa, Lance Corrimal, Lilly Zenovka, Makomk Makosen, Mana Janus, Matthew Dowd, Michelle2 Zenovka, Mimika Oh, Mm Alder, Nemurimasu Neiro, Nicholaz Beresford, Nicky Perian, Patrick Sapinski, Paul Churchill, Peter Lameth, Qarl Fizz, Revolution Smythe, Robin Cornelius, Seraph Linden, Shyotl Kuhr, Siana Gearz, SignpostMarv Martin, Stephen Zenith, TankMaster Finesmith, Thickbrick Sleaford, Thomas Shikami, Tom Meta, Tonya Souther, tx Oh, Vaalith Jinn, Vadim Bigbear, Vex Streeter, WhiteStar Magic, Zi Ree, and Zwagoth Klaar. For their WindLight presets, we thank Ana Lutetia, CodeBastard Redgrave, and Torley Linden. - Thanks also to the developer(s) of the Emerald Viewer, Hippo Viewer, Cool VL Viewer, Snowglobe Viewer, Meta7 Viewer, FrozenGlobe Viewer, and Meerkat Viewer for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible. + Thanks also to the developer(s) of the Ascent Viewer, Astra Viewer, Cool VL Viewer, Dolphin Viewer, Emerald Viewer, FrozenGlobe Viewer, Hippo Viewer, Meerkat Viewer, Meta7 Viewer, Phoenix Viewer, Singularity Viewer and Snowglobe Viewer for viewer enhancements we have incorporated, as well as Kitty Barnett for RLVa. Special thanks to the folks at Linden Lab for releasing the viewer source, without which this endeavor would have been impossible. For a complete list of who did what, read the release notes! -- cgit v1.1 From 7e5bcc23cee589cb05fb3c2c314b92333a0818f8 Mon Sep 17 00:00:00 2001 From: Jacek Antonelli Date: Wed, 8 Jun 2011 02:06:06 -0500 Subject: Fixed some malformed XML in German IM / Group Chat floaters. --- .../indra/newview/skins/default/xui/de/floater_instant_message.xml | 6 +++--- .../newview/skins/default/xui/de/floater_instant_message_group.xml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'linden/indra/newview') diff --git a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml index fb40e39..fe38b2a 100644 --- a/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml +++ b/linden/indra/newview/skins/default/xui/de/floater_instant_message.xml @@ -36,21 +36,21 @@ Freund hinzufügen - + Verlauf anzeigen Bezahlen - + Teleport anbieten