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

Merge branch 'master' of github.com:HazimGazov/Inertia

Browse Source
This commit is contained in:
phr0z3nt04st
2010-05-17 23:55:54 -05:00
parent 92ec091e44 81af23798a
commit 1e29181592
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/newview/llviewerinventory.cpp
View File

@@ -163,14 +163,14 @@ void LLViewerInventoryItem::removeFromServer()
void LLViewerInventoryItem::updateServer(BOOL is_new) const void LLViewerInventoryItem::updateServer(BOOL is_new) const
{ {
if(!mIsComplete) /*if(!mIsComplete)
{ {
// *FIX: deal with this better. // *FIX: deal with this better.
// If we're crashing here then the UI is incorrectly enabled. // If we're crashing here then the UI is incorrectly enabled.
llerrs << "LLViewerInventoryItem::updateServer() - for incomplete item" llerrs << "LLViewerInventoryItem::updateServer() - for incomplete item"
<< llendl; << llendl;
return; return;
} }*/
if(gAgent.getID() != mPermissions.getOwner()) if(gAgent.getID() != mPermissions.getOwner())
{ {
// *FIX: deal with this better. // *FIX: deal with this better.

4
indra/newview/skins/default/xui/en-us/panel_login.xml
View File

@@ -146,7 +146,7 @@
text_enabled_color="110, 15, 15, 255" width="87" font_size="Small" /> text_enabled_color="110, 15, 15, 255" width="87" font_size="Small" />
<spinner decimal_digits="0" follows="left|bottom" height="15" <spinner decimal_digits="0" follows="left|bottom" height="15"
increment="1" initial_val="0" label="Patch" label_width="40" left_delta="0" increment="1" initial_val="0" label="Patch" label_width="40" left_delta="0"
max_val="9999" min_val="0" mouse_opaque="true" name="verbuild_spin" control_edit="SpecifiedVersionBuild" max_val="999999" min_val="0" mouse_opaque="true" name="verbuild_spin" control_edit="SpecifiedVersionBuild"
text_enabled_color="110, 15, 15, 255" width="87" font_size="Small" /> text_enabled_color="110, 15, 15, 255" width="110" font_size="Small" />
</panel> </panel>