Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/TighMacFanatic/SingularityViewer into future

Browse Source 
Conflicts:
	etc/message.xml
This commit is contained in:
Siana Gearz
2011-10-09 02:08:20 +02:00
parent afc91b76b0 85cbc8acda
commit ff0c7a1925
16 changed files with 1840 additions and 1820 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
indra/newview/llfloateravatartextures.cpp
View File

@@ -165,9 +165,7 @@ void LLFloaterAvatarTextures::refresh()
// static
void LLFloaterAvatarTextures::onClickDump(void* data)
{
// <edit>
//#if !LL_RELEASE_FOR_DOWNLOAD
// </edit>
#if !LL_RELEASE_FOR_DOWNLOAD
LLFloaterAvatarTextures* self = (LLFloaterAvatarTextures*)data;
LLVOAvatar* avatarp = find_avatar(self->mID);
if (!avatarp) return;
@@ -179,7 +177,5 @@ void LLFloaterAvatarTextures::onClickDump(void* data)
llinfos << "Avatar TE " << i << " id " << te->getID() << llendl;
}
// <edit>
//#endif
// </edit>
#endif
}

7
indra/newview/llfloaterchat.cpp
View File

@@ -609,11 +609,14 @@ LLColor4 get_text_color(const LLChat& chat)
static const LLCachedControl<bool> mKeywordsChangeColor(gSavedPerAccountSettings, "KeywordsChangeColor", false);
static const LLCachedControl<LLColor4> mKeywordsColor(gSavedPerAccountSettings, "KeywordsColor", LLColor4(1.f, 1.f, 1.f, 1.f));
if (gAgent.getID() != chat.mFromID)
if ((gAgent.getID() != chat.mFromID) && (chat.mSourceType != CHAT_SOURCE_SYSTEM))
{
if (mKeywordsChangeColor)
{
if (AscentKeyword::hasKeyword(chat.mText, 1))
std::string shortmsg(chat.mText);
shortmsg.erase(0, chat.mFromName.length());
if (AscentKeyword::hasKeyword(shortmsg, 1))
{
text_color = mKeywordsColor;
}

14
indra/newview/llinventoryview.cpp
View File

@@ -588,6 +588,7 @@ BOOL LLInventoryView::postBuild()
childSetAction("Inventory.ResetAll",onResetAll,this);
childSetAction("Inventory.ExpandAll",onExpandAll,this);
childSetAction("collapse_btn", onCollapseAll, this);
//panel->getFilter()->markDefault();
return TRUE;
@@ -1354,6 +1355,19 @@ void LLInventoryView::onExpandAll(void* userdata)
}
//static
void LLInventoryView::onCollapseAll(void* userdata)
{
LLInventoryView* self = (LLInventoryView*) userdata;
self->mActivePanel = (LLInventoryPanel*)self->childGetVisibleTab("inventory filter tabs");
if (!self->mActivePanel)
{
return;
}
self->mActivePanel->closeAllFolders();
}
//static
void LLInventoryView::onFilterSelected(void* userdata, bool from_click)
{

1
indra/newview/llinventoryview.h
View File

@@ -282,6 +282,7 @@ public:
static void onFilterSelected(void* userdata, bool from_click);
static void onResetAll(void* userdata);
static void onExpandAll(void* userdata);
static void onCollapseAll(void* userdata);
static void onSelectionChange(const std::deque<LLFolderViewItem*> &items, BOOL user_action, void* data);
const std::string getFilterSubString() { return mActivePanel->getFilterSubString(); }

2
indra/newview/lloverlaybar.cpp
View File

@@ -464,7 +464,7 @@ void LLOverlayBar::onClickStandUp(void*)
void LLOverlayBar::onClickCancelTP(void* data)
{
LLOverlayBar* self = (LLOverlayBar*)data;
self->setCancelTPButtonVisible(FALSE,std::string("Cancel"));
self->setCancelTPButtonVisible(FALSE, std::string("Cancel TP"));
gAgent.teleportCancel();
llinfos << "trying to cancel teleport" << llendl;
}

2
indra/newview/llstartup.cpp
View File

@@ -372,7 +372,7 @@ bool idle_startup()
static U64 first_sim_handle = 0;
static LLHost first_sim;
static std::string first_sim_seed_cap;
static U32 first_sim_size_x = 256;
static U32 first_sim_size_x = 256;
static U32 first_sim_size_y = 256;
static LLVector3 initial_sun_direction(1.f, 0.f, 0.f);

16
indra/newview/llsurface.cpp
View File

@@ -699,14 +699,14 @@ void LLSurface::decompressDCTPatch(LLBitPack &bitpack, LLGroupHeader *gopp, BOOL
}
if (b_large_patch)
{
i = ph.patchids >> 16; //x
j = ph.patchids & 0xFFFF; //y
}
else
{
i = ph.patchids >> 5; //x
j = ph.patchids & 0x1F; //y
{
i = ph.patchids >> 16; //x
j = ph.patchids & 0xFFFF; //y
}
else
{
i = ph.patchids >> 5; //x
j = ph.patchids & 0x1F; //y
}
if ((i >= mPatchesPerEdge) || (j >= mPatchesPerEdge))

44
indra/newview/llviewermessage.cpp
View File

@@ -3705,17 +3705,17 @@ void process_teleport_finish(LLMessageSystem* msg, void**)
U32 teleport_flags;
msg->getU32Fast(_PREHASH_Info, _PREHASH_TeleportFlags, teleport_flags);
U32 region_size_x = 256;
msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeX, region_size_x);
U32 region_size_y = 256;
msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeY, region_size_y);
//and a little hack for Second Life compatibility
if (region_size_y == 0 || region_size_x == 0)
{
region_size_x = 256;
region_size_y = 256;
U32 region_size_x = 256;
msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeX, region_size_x);
U32 region_size_y = 256;
msg->getU32Fast(_PREHASH_Info, _PREHASH_RegionSizeY, region_size_y);
//and a little hack for Second Life compatibility
if (region_size_y == 0 || region_size_x == 0)
{
region_size_x = 256;
region_size_y = 256;
}
std::string seedCap;
@@ -4042,17 +4042,17 @@ void process_crossed_region(LLMessageSystem* msg, void**)
std::string seedCap;
msg->getStringFast(_PREHASH_RegionData, _PREHASH_SeedCapability, seedCap);
U32 region_size_x = 256;
msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeX, region_size_x);
U32 region_size_y = 256;
msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeY, region_size_y);
//and a little hack for Second Life compatibility
if (region_size_y == 0 || region_size_x == 0)
{
region_size_x = 256;
region_size_y = 256;
U32 region_size_x = 256;
msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeX, region_size_x);
U32 region_size_y = 256;
msg->getU32(_PREHASH_RegionData, _PREHASH_RegionSizeY, region_size_y);
//and a little hack for Second Life compatibility
if (region_size_y == 0 || region_size_x == 0)
{
region_size_x = 256;
region_size_y = 256;
}
send_complete_agent_movement(sim_host);

2
indra/newview/llviewerparceloverlay.cpp
View File

@@ -414,7 +414,7 @@ void LLViewerParcelOverlay::uncompressLandOverlay(S32 chunk, U8 *packed_overlay)
{
// Unpack the message data into the ownership array
S32 size = mParcelGridsPerEdge * mParcelGridsPerEdge;
S32 mParcelOverLayChunks = mRegionSize * mRegionSize / (128 * 128);
S32 mParcelOverLayChunks = mRegionSize * mRegionSize / (128 * 128);
S32 chunk_size = size / mParcelOverLayChunks;
memcpy(mOwnership + chunk*chunk_size, packed_overlay, chunk_size); /*Flawfinder: ignore*/

3496
indra/newview/llviewerregion.cpp
View File

File diff suppressed because it is too large Load Diff

1
indra/newview/llvoavatardefines.cpp
View File

@@ -42,6 +42,7 @@ using namespace LLVOAvatarDefines;
/*********************************************************************************
* Edit this function to add/remove/change textures and mesh definitions for avatars.
* If these are changed, they MUST be changed in floater_avatar_textures.xml as well!
*/
LLVOAvatarDictionary::Textures::Textures()

22
indra/newview/llworld.cpp
View File

@@ -172,7 +172,7 @@ LLViewerRegion* LLWorld::addRegion(const U64 &region_handle, const LLHost &host,
U32 iindex = 0;
U32 jindex = 0;
mWidth = region_size_x;
mWidth = region_size_x;
mWidthInMeters = mWidth * mScale;
from_region_handle(region_handle, &iindex, &jindex);
S32 x = (S32)(iindex/256);
@@ -1256,16 +1256,16 @@ void process_enable_simulator(LLMessageSystem *msg, void **user_data)
// which simulator should we modify?
LLHost sim(ip_u32, port);
U32 region_size_x = 256;
msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeX, region_size_x);
U32 region_size_y = 256;
msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeY, region_size_y);
if (region_size_y == 0 || region_size_x == 0)
{
region_size_x = 256;
region_size_y = 256;
U32 region_size_x = 256;
msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeX, region_size_x);
U32 region_size_y = 256;
msg->getU32Fast(_PREHASH_SimulatorInfo, _PREHASH_RegionSizeY, region_size_y);
if (region_size_y == 0 || region_size_x == 0)
{
region_size_x = 256;
region_size_y = 256;
}
// Viewer trusts the simulator.

30
indra/newview/skins/default/xui/en-us/floater_avatar_textures.xml
View File

@@ -12,34 +12,34 @@
>
<button bottom="-45" left="-160" font="SansSerif" halign="center" height="20" label="Dump IDs to Console"
label_selected="Dump" mouse_opaque="true" name="Dump" scale_image="TRUE" width="150" />
<!-- The names of the following must match the definitions in llvoavatardefines.cpp -->
<texture_picker bottom="-130" height="111" label="Hair Baked" left="4" name="hair-baked" width="96" />
<texture_picker bottom_delta="0" height="111" label="Hair" left_delta="99" name="hair" width="96" />
<texture_picker bottom_delta="0" height="111" label="Hair" left_delta="99" name="hair_grain" width="96" />
<texture_picker bottom_delta="0" height="111" label="Eyes Baked" left_delta="99" name="eyes-baked" width="96" />
<texture_picker bottom_delta="0" height="111" label="Eyes" left_delta="99" name="iris" width="96" />
<texture_picker bottom_delta="0" height="111" label="Eyes" left_delta="99" name="eyes_iris" width="96" />
<texture_picker bottom_delta="-110" height="111" label="Head Baked" left="4" name="head-baked" width="96" />
<texture_picker bottom_delta="0" height="111" label="Makeup" left_delta="99" name="head bodypaint" width="96" />
<texture_picker bottom_delta="0" height="111" label="Makeup" left_delta="99" name="head_bodypaint" width="96" />
<texture_picker bottom_delta="0" height="111" label="Head Tattoo" left_delta="99" name="head_tattoo" width="96" />
<texture_picker bottom_delta="0" height="111" label="Upper Tattoo" left_delta="99" name="upper_tattoo" width="96" />
<texture_picker bottom_delta="0" height="111" label="Lower Tattoo" left_delta="99" name="lower_tattoo" width="96" />
<texture_picker bottom_delta="-110" height="111" label="Upper Baked" left="4" name="upper-baked" width="96" />
<texture_picker bottom_delta="0" height="111" label="Upper Skin" left_delta="99" name="upper bodypaint" width="96" />
<texture_picker bottom_delta="0" height="111" label="Undershirt" left_delta="99" name="undershirt" width="96" />
<texture_picker bottom_delta="0" height="111" label="Shirt" left_delta="99" name="shirt" width="96" />
<texture_picker bottom_delta="0" height="111" label="Upper Jacket" left_delta="99" name="upper jacket" width="96" />
<texture_picker bottom_delta="0" height="111" label="Gloves" left_delta="99" name="gloves" width="96" />
<texture_picker bottom_delta="0" height="111" label="Upper Skin" left_delta="99" name="upper_bodypaint" width="96" />
<texture_picker bottom_delta="0" height="111" label="Undershirt" left_delta="99" name="upper_undershirt" width="96" />
<texture_picker bottom_delta="0" height="111" label="Shirt" left_delta="99" name="upper_shirt" width="96" />
<texture_picker bottom_delta="0" height="111" label="Upper Jacket" left_delta="99" name="upper_jacket" width="96" />
<texture_picker bottom_delta="0" height="111" label="Gloves" left_delta="99" name="upper_gloves" width="96" />
<texture_picker bottom_delta="-110" height="111" label="Lower Baked" left="4" name="lower-baked" width="96" />
<texture_picker bottom_delta="0" height="111" label="Lower Skin" left_delta="99" name="lower bodypaint" width="96" />
<texture_picker bottom_delta="0" height="111" label="Underpants" left_delta="99" name="underpants" width="96" />
<texture_picker bottom_delta="0" height="111" label="Pants" left_delta="99" name="pants" width="96" />
<texture_picker bottom_delta="0" height="111" label="Lower Jacket" left_delta="99" name="lower jacket" width="96" />
<texture_picker bottom_delta="0" height="111" label="Socks" left_delta="99" name="socks" width="96" />
<texture_picker bottom_delta="0" height="111" label="Lower Skin" left_delta="99" name="lower_bodypaint" width="96" />
<texture_picker bottom_delta="0" height="111" label="Underpants" left_delta="99" name="lower_underpants" width="96" />
<texture_picker bottom_delta="0" height="111" label="Pants" left_delta="99" name="lower_pants" width="96" />
<texture_picker bottom_delta="0" height="111" label="Lower Jacket" left_delta="99" name="lower_jacket" width="96" />
<texture_picker bottom_delta="0" height="111" label="Socks" left_delta="99" name="lower_socks" width="96" />
<texture_picker bottom_delta="-110" height="111" label="Skirt Baked" left="4" name="skirt-baked" width="96" />
<texture_picker bottom_delta="0" height="111" label="Skirt" left_delta="99" name="skirt" width="96" />
<texture_picker bottom_delta="0" height="111" label="Shoes" left_delta="99" name="shoes" width="96" />
<texture_picker bottom_delta="0" height="111" label="Shoes" left_delta="99" name="lower_shoes" width="96" />
</floater>

9
indra/newview/skins/default/xui/en-us/floater_inventory.xml
View File

@@ -5,8 +5,11 @@
title="Inventory" width="467">
<search_editor bottom="-50" follows="left|top|right" height="16" label="Type here to search"
left="6" mouse_opaque="true" name="inventory search editor" width="455" />
<text name="group_titles_textbox" font="SansSerifSmall" follows="left|top"
height="16" left="10" bottom_delta="-24" width="120">Quick Filter:</text>
<button left="10" bottom_delta="-24" height="20" width="25" follows="left|top" halign="center"
label="--" name="collapse_btn" mouse_opaque="true" font="SansSerif"
tool_tip="Collapse All" />
<text name="group_titles_textbox" font="SansSerifSmall" follows="left|top"
height="16" left_delta="35" bottom_delta="0" width="120">Quick Filter:</text>
<!-- Inventory Type Filter Labels -->
<string name="filter_type_all">All Types</string>
<string name="filter_type_animation">Animations</string>
@@ -21,7 +24,7 @@
<string name="filter_type_texture">Textures</string>
<string name="filter_type_snapshot">Snapshots</string>
<string name="filter_type_custom">Custom...</string>
<combo_box name="Quick Filter" label="Quick Filter" follows="left|top" height="20" left="80" width="150" bottom_delta="0">
<combo_box name="Quick Filter" label="Quick Filter" follows="left|top" height="20" left_delta="60" width="150" bottom_delta="0">
<combo_item name="filter_type_all">All Types</combo_item>
<separator />
<combo_item name="filter_type_animation">Animations</combo_item>

1
indra/newview/skins/default/xui/en-us/panel_group_general.xml
View File

@@ -147,7 +147,6 @@ Hover your mouse over the options for more help.
</text>
<combo_box length="120" width="175" bottom_delta="-25" follows="left|top" height="20" left_delta="0" name="active_title"
tool_tip="Sets the title that appears in your avatar&apos;s name tag when this group is active." />
</panel>
</panel>
<string name="incomplete_member_data_str">
Retrieving member data

5
indra/newview/skins/default/xui/en-us/panel_overlaybar.xml
View File

@@ -38,7 +38,10 @@
<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
label="Stand Up" label_selected="Stand Up" left="457" name="Stand Up"
scale_image="true" tool_tip="Click here to stand up." width="102" />
</layout_panel>
<button bottom="1" follows="left|bottom" font="SansSerif" halign="center" height="20"
label="Cancel TP" label_selected="Cancel TP" left="571" name="Cancel TP"
scale_image="true" tool_tip="Click here to cancel the current teleport process." width="102" />
</layout_panel>
<layout_panel auto_resize="false" background_visible="false" border="false" bottom="0"
filename="panel_chat_bar.xml" follows="left|right|bottom" left="0"
min_height="24" mouse_opaque="false" name="chat_bar"