aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog.txt58
-rw-r--r--linden/indra/cmake/00-Common.cmake23
-rw-r--r--linden/indra/cmake/GStreamer.cmake34
-rwxr-xr-xlinden/indra/develop.py2
-rw-r--r--linden/indra/newview/app_settings/settings.xml11
-rw-r--r--linden/indra/newview/llfloatermap.cpp36
-rw-r--r--linden/indra/newview/llinventorybridge.cpp10
-rw-r--r--linden/indra/newview/llnetmap.cpp37
-rw-r--r--linden/indra/newview/llpanelpermissions.cpp7
-rw-r--r--linden/indra/newview/llvoavatar.cpp65
-rw-r--r--linden/indra/newview/llvoavatar.h3
-rw-r--r--linden/indra/newview/llwindlightremotectrl.cpp11
-rw-r--r--linden/indra/newview/llworldmapview.cpp3
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/floater_tools.xml2
-rw-r--r--linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml2
16 files changed, 248 insertions, 58 deletions
diff --git a/ChangeLog.txt b/ChangeLog.txt
index 5110fd5..30ab5fb 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -1,3 +1,42 @@
12009-09-25 McCabe Maxsted <hakushakukun@gmail.com>
2
3 * Removed problematic /MP flag.
4
5 modified: linden/indra/cmake/00-Common.cmake
6
7
8 * Fixed Windows using wrong GStreamer library names.
9
10 modified: linden/indra/cmake/GStreamer.cmake
11
12
13 * Fixed region names not showing up on regions with zero avatars.
14
15 modified: linden/indra/newview/llworldmapview.cpp
16
17
182009-09-24 McCabe Maxsted <hakushakukun@gmail.com>
19
20 * Applied RLVa patch for Imprudence 1.2 by Kitty Barnett.
21
22 modified: linden/indra/newview/llfloatermap.cpp
23 modified: linden/indra/newview/llinventorybridge.cpp
24 modified: linden/indra/newview/llnetmap.cpp
25 modified: linden/indra/newview/llpanelpermissions.cpp
26 modified: linden/indra/newview/llwindlightremotectrl.cpp
27
28
29 * Fixed Add button being enabled for friends in the radar.
30
31 modified: linden/indra/newview/llfloatermap.cpp
32
33
34 * Fixed Last Owner text in tools window not disabling.
35
36 modified: linden/indra/newview/llpanelpermissions.cpp
37 modified: linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
38
39
12009-09-23 Jacek Antonelli <jacek.antonelli@gmail.com> 402009-09-23 Jacek Antonelli <jacek.antonelli@gmail.com>
2 41
3 * Moved "Show HUD Attachments" back to View, restored shortcut. 42 * Moved "Show HUD Attachments" back to View, restored shortcut.
@@ -6,6 +45,25 @@
6 modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml 45 modified: linden/indra/newview/skins/default/xui/en-us/menu_viewer.xml
7 46
8 47
482009-09-22 McCabe Maxsted <hakushakukun@gmail.com>
49
50 * Fixed RLVa issue in LLNetMap the right way (thanks Kitty).
51
52 modified: linden/indra/newview/llnetmap.cpp
53
54
55 * Clarifed Mini-Map menu option: 'Show Map' to 'Show World Map'.
56
57 modified: linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
58
59
60 * Applied particle chat feature from Emerald viewer (tell an object it's selected on channel 9000).
61
62 modified: linden/indra/newview/app_settings/settings.xml
63 modified: linden/indra/newview/llvoavatar.cpp
64 modified: linden/indra/newview/llvoavatar.h
65
66
92009-09-21 McCabe Maxsted <hakushakukun@gmail.com> 672009-09-21 McCabe Maxsted <hakushakukun@gmail.com>
10 68
11 * Changed 'Presets' button to 'Sky'. 69 * Changed 'Presets' button to 'Sky'.
diff --git a/linden/indra/cmake/00-Common.cmake b/linden/indra/cmake/00-Common.cmake
index 27838d6..2d691ad 100644
--- a/linden/indra/cmake/00-Common.cmake
+++ b/linden/indra/cmake/00-Common.cmake
@@ -31,9 +31,15 @@ if (WINDOWS)
31 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 31 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO
32 "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MT" 32 "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} /Od /Zi /MT"
33 CACHE STRING "C++ compiler release-with-debug options" FORCE) 33 CACHE STRING "C++ compiler release-with-debug options" FORCE)
34 set(CMAKE_CXX_FLAGS_RELEASE 34 if (MSVC80)
35 set(CMAKE_CXX_FLAGS_RELEASE
36 "${CMAKE_CXX_FLAGS_RELEASE} /O2 /Ob2 /Oi /Ot /Oy /GT /Zi /MT"
37 CACHE STRING "C++ compiler release options" FORCE)
38 else (MSVC80)
39 set(CMAKE_CXX_FLAGS_RELEASE
35 "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MT" 40 "${CMAKE_CXX_FLAGS_RELEASE} ${LL_CXX_FLAGS} /O2 /Zi /MT"
36 CACHE STRING "C++ compiler release options" FORCE) 41 CACHE STRING "C++ compiler release options" FORCE)
42 endif (MSVC80)
37 43
38 add_definitions( 44 add_definitions(
39 /DLL_WINDOWS=1 45 /DLL_WINDOWS=1
@@ -57,21 +63,6 @@ if (WINDOWS)
57 /Zc:wchar_t- 63 /Zc:wchar_t-
58 ) 64 )
59 endif (MSVC80 OR MSVC90) 65 endif (MSVC80 OR MSVC90)
60
61 # VS optimization flags
62 if(MSVC80)
63
64 set(NUMBER_OF_CORES $ENV{NUMBER_OF_PROCESSORS})
65
66 set(CMAKE_CXX_FLAGS_RELEASE
67 "${CMAKE_CXX_FLAGS_RELEASE} /Ob2 /Oi /Ot /GT"
68 CACHE STRING "C++ compiler release options" FORCE)
69
70 add_definitions(
71 /MP${NUMBER_OF_CORES}
72 )
73
74 endif (MSVC80)
75 66
76 # Are we using the crummy Visual Studio KDU build workaround? 67 # Are we using the crummy Visual Studio KDU build workaround?
77 if (NOT VS_DISABLE_FATAL_WARNINGS) 68 if (NOT VS_DISABLE_FATAL_WARNINGS)
diff --git a/linden/indra/cmake/GStreamer.cmake b/linden/indra/cmake/GStreamer.cmake
index 29896d0..8bfad11 100644
--- a/linden/indra/cmake/GStreamer.cmake
+++ b/linden/indra/cmake/GStreamer.cmake
@@ -29,23 +29,23 @@ if (WINDOWS)
29 gmodule-2.0 29 gmodule-2.0
30 gobject-2.0 30 gobject-2.0
31 gthread-2.0 31 gthread-2.0
32 libgstvideo-0.10 32 libgstvideo.lib
33 libgsttag-0.10 33 libgsttag.lib
34 libgstsdp-0.10 34 libgstsdp.lib
35 libgstrtsp-0.10 35 libgstrtsp.lib
36 libgstrtp-0.10 36 libgstrtp.lib
37 libgstriff-0.10 37 libgstriff.lib
38 libgstreamer-0.10 38 libgstreamer-0.10.lib
39 libgstpbutils-0.10 39 libgstpbutils.lib
40 libgstnetbuffer-0.10 40 libgstnetbuffer.lib
41 libgstnet-0.10 41 libgstnet-0.10.lib
42 libgstinterfaces-0.10 42 libgstinterfaces.lib
43 libgstdshow-0.10 43 libgstdshow.lib
44 libgstdataprotocol-0.10 44 libgstdataprotocol-0.10.lib
45 libgstcontroller-0.10 45 libgstcontroller-0.10.lib
46 libgstbase-0.10 46 libgstbase-0.10.lib
47 libgstaudio-0.10 47 libgstaudio.lib
48 libgstapp-0.10 48 libgstapp.lib
49 libxml2 49 libxml2
50 libxml2_a 50 libxml2_a
51 libxml2_a_dll 51 libxml2_a_dll
diff --git a/linden/indra/develop.py b/linden/indra/develop.py
index 207a48b..85837ba 100755
--- a/linden/indra/develop.py
+++ b/linden/indra/develop.py
@@ -536,7 +536,7 @@ class WindowsSetup(PlatformSetup):
536 gen = gen.lower() 536 gen = gen.lower()
537 try: 537 try:
538 import _winreg 538 import _winreg
539 key_str = (r'SOFTWARE\Microsoft\VCEXpress\%s\Setup\VC' % 539 key_str = (r'SOFTWARE\Microsoft\VCExpress\%s\Setup\VC' %
540 self.gens[gen]['ver']) 540 self.gens[gen]['ver'])
541 value_str = (r'ProductDir') 541 value_str = (r'ProductDir')
542 print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' % 542 print ('Reading VS environment from HKEY_LOCAL_MACHINE\%s\%s' %
diff --git a/linden/indra/newview/app_settings/settings.xml b/linden/indra/newview/app_settings/settings.xml
index 194e95e..087c92f 100644
--- a/linden/indra/newview/app_settings/settings.xml
+++ b/linden/indra/newview/app_settings/settings.xml
@@ -5559,6 +5559,17 @@
5559 <key>Value</key> 5559 <key>Value</key>
5560 <integer>0</integer> 5560 <integer>0</integer>
5561 </map> 5561 </map>
5562 <key>ParticleChat</key>
5563 <map>
5564 <key>Comment</key>
5565 <string>Chat target of effect beam to channel 9000</string>
5566 <key>Persist</key>
5567 <integer>1</integer>
5568 <key>Type</key>
5569 <string>Boolean</string>
5570 <key>Value</key>
5571 <integer>1</integer>
5572 </map>
5562 <key>PerAccountSettingsFile</key> 5573 <key>PerAccountSettingsFile</key>
5563 <map> 5574 <map>
5564 <key>Comment</key> 5575 <key>Comment</key>
diff --git a/linden/indra/newview/llfloatermap.cpp b/linden/indra/newview/llfloatermap.cpp
index 3be891e..6d23ab4 100644
--- a/linden/indra/newview/llfloatermap.cpp
+++ b/linden/indra/newview/llfloatermap.cpp
@@ -240,6 +240,13 @@ void LLFloaterMap::populateRadar()
240 std::string fullname = getSelectedName(avatar_ids[i]); 240 std::string fullname = getSelectedName(avatar_ids[i]);
241 if (!fullname.empty()) 241 if (!fullname.empty())
242 { 242 {
243// [RLVa:KB] - Alternate: Imprudence-1.2.0
244 if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
245 {
246 fullname = gRlvHandler.getAnonym(fullname);
247 }
248// [/RLVa:KB]
249
243 std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("muted") : ""; 250 std::string mute_text = LLMuteList::getInstance()->isMuted(avatar_ids[i]) ? getString("muted") : "";
244 element["id"] = avatar_ids[i]; 251 element["id"] = avatar_ids[i];
245 element["columns"][0]["column"] = "avatar_name"; 252 element["columns"][0]["column"] = "avatar_name";
@@ -290,12 +297,14 @@ void LLFloaterMap::toggleButtons()
290 BOOL enable_unmute = FALSE; 297 BOOL enable_unmute = FALSE;
291 BOOL enable_track = FALSE; 298 BOOL enable_track = FALSE;
292 BOOL enable_estate = FALSE; 299 BOOL enable_estate = FALSE;
300 BOOL enable_friend = FALSE;
293 if (childHasFocus("RadarPanel")) 301 if (childHasFocus("RadarPanel"))
294 { 302 {
295 enable = mSelectedAvatar.notNull() ? visibleItemsSelected() : FALSE; 303 enable = mSelectedAvatar.notNull() ? visibleItemsSelected() : FALSE;
296 enable_unmute = mSelectedAvatar.notNull() ? LLMuteList::getInstance()->isMuted(mSelectedAvatar) : FALSE; 304 enable_unmute = mSelectedAvatar.notNull() ? LLMuteList::getInstance()->isMuted(mSelectedAvatar) : FALSE;
297 enable_track = gAgent.isGodlike() || is_agent_mappable(mSelectedAvatar); 305 enable_track = gAgent.isGodlike() || is_agent_mappable(mSelectedAvatar);
298 enable_estate = getKickable(mSelectedAvatar); 306 enable_estate = getKickable(mSelectedAvatar);
307 enable_friend = !is_agent_friend(mSelectedAvatar);
299 } 308 }
300 else 309 else
301 { 310 {
@@ -314,6 +323,33 @@ void LLFloaterMap::toggleButtons()
314 childSetEnabled("unmute_btn", enable_unmute); 323 childSetEnabled("unmute_btn", enable_unmute);
315 childSetEnabled("ar_btn", enable); 324 childSetEnabled("ar_btn", enable);
316 childSetEnabled("estate_eject_btn", enable_estate); 325 childSetEnabled("estate_eject_btn", enable_estate);
326
327// [RLVa:KB] - Imprudence-1.2.0
328 // Bit clumsy, but this way the RLV stuff is in its own separate block and keeps the code above clean - Kitty
329 if ( (rlv_handler_t::isEnabled()) && (mSelectedAvatar.notNull()) )
330 {
331 if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
332 {
333 childSetEnabled("im_btn", FALSE);
334 childSetEnabled("profile_btn", FALSE);
335 childSetEnabled("invite_btn", FALSE);
336 childSetEnabled("add_btn", FALSE);
337 childSetEnabled("mute_btn", FALSE);
338 childSetEnabled("unmute_btn", FALSE);
339 }
340
341 // Even though the avie is in the same sim (so they already know where we are) the tp would just get blocked by different code
342 // so it's actually less confusing to the user if we just disable the teleport button here so they'll at least have a visual cue
343 BOOL rlv_enable_tp = (!gRlvHandler.hasBehaviour(RLV_BHVR_TPLURE)) || (gRlvHandler.isException(RLV_BHVR_TPLURE, mSelectedAvatar));
344 if ( (rlv_enable_tp) && (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) )
345 {
346 const LLRelationship* pBuddyInfo = LLAvatarTracker::instance().getBuddyInfo(mSelectedAvatar);
347 if ( ((!pBuddyInfo) || (!pBuddyInfo->isOnline()) || (!pBuddyInfo->isRightGrantedTo(LLRelationship::GRANT_MAP_LOCATION))) )
348 rlv_enable_tp = FALSE;
349 }
350 childSetEnabled("offer_teleport_btn", rlv_enable_tp);
351 }
352// [/RLVa:KB]
317} 353}
318 354
319BOOL LLFloaterMap::getKickable(const LLUUID &agent_id) 355BOOL LLFloaterMap::getKickable(const LLUUID &agent_id)
diff --git a/linden/indra/newview/llinventorybridge.cpp b/linden/indra/newview/llinventorybridge.cpp
index 19a5ade..618c4f9 100644
--- a/linden/indra/newview/llinventorybridge.cpp
+++ b/linden/indra/newview/llinventorybridge.cpp
@@ -4241,7 +4241,15 @@ void wear_attachments_on_avatar(const std::set<LLUUID>& item_ids, BOOL remove)
4241 { 4241 {
4242 if ( (gInventory.isObjectDescendentOf(*it, gAgent.getInventoryRootID())) ) 4242 if ( (gInventory.isObjectDescendentOf(*it, gAgent.getInventoryRootID())) )
4243 { 4243 {
4244 items.put(item); 4244// items.put(item);
4245// [RLVa:KB] - Checked: 2009-09-11 (RLVa-1.0.2c) | Modified: RLVa-1.0.2c
4246 LLViewerJointAttachment* pAttachPt = NULL;
4247 if ( (!rlv_handler_t::isEnabled()) || (RlvSettings::getEnableWear()) || (!gRlvHandler.hasLockedAttachment()) ||
4248 (((pAttachPt = gRlvHandler.getAttachPoint(item, true)) != NULL) && (gRlvHandler.isDetachable(pAttachPt->getObject()))) )
4249 {
4250 items.put(item);
4251 }
4252// [/RLVa:KB]
4245 } 4253 }
4246 else if ( (item->isComplete()) ) 4254 else if ( (item->isComplete()) )
4247 { 4255 {
diff --git a/linden/indra/newview/llnetmap.cpp b/linden/indra/newview/llnetmap.cpp
index 9ef56c1..e848aeb 100644
--- a/linden/indra/newview/llnetmap.cpp
+++ b/linden/indra/newview/llnetmap.cpp
@@ -379,8 +379,8 @@ void LLNetMap::draw()
379 } 379 }
380 } 380 }
381 381
382// [RLVa:KB] 382// [RLVa:KB] - Alternate: Imprudence-1.2.0
383 if ( rlv_handler_t::isEnabled() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) ) 383 if ( gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) )
384 { 384 {
385 // User is not allowed to see who it is, or even if it's a friend, 385 // User is not allowed to see who it is, or even if it's a friend,
386 // due to RLV settings. 386 // due to RLV settings.
@@ -604,22 +604,15 @@ BOOL LLNetMap::handleToolTip( S32 x, S32 y, std::string& msg, LLRect* sticky_rec
604 std::string fullname; 604 std::string fullname;
605 if(mClosestAgentToCursor.notNull() && gCacheName->getFullName(mClosestAgentToCursor, fullname)) 605 if(mClosestAgentToCursor.notNull() && gCacheName->getFullName(mClosestAgentToCursor, fullname))
606 { 606 {
607// [RLVa:KB] 607// [RLVa:KB] - Alternate: Imprudence-1.2.0
608 if ( rlv_handler_t::isEnabled() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES) ) 608 // User is not allowed to see who it is, due to RLV settings.
609 { 609 msg.append( (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) ? fullname : gRlvHandler.getAnonym(fullname) );
610 // User is not allowed to see who it is, due to RLV settings. 610 msg.append("\n");
611 msg.append(rlv_handler_t::cstrHidden); 611 // [/RLVa:KB]
612 }
613 else
614 {
615 msg.append(fullname);
616 msg.append("\n");
617 }
618// [/RLVa:KB]
619 } 612 }
620 613
621// [RLVa:KB] 614// [RLVa:KB] - Alternate: Imprudence-1.2.0
622 if (rlv_handler_t::isEnabled() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC)) 615 if ( gRlvHandler.hasBehaviour(RLV_BHVR_SHOWLOC) )
623 { 616 {
624 // User is not allowed to see where they are, due to RLV settings. 617 // User is not allowed to see where they are, due to RLV settings.
625 msg.append( rlv_handler_t::cstrHidden ); 618 msg.append( rlv_handler_t::cstrHidden );
@@ -1028,6 +1021,13 @@ bool LLNetMap::LLEnableTracking::handleEvent(LLPointer<LLEvent> event, const LLS
1028 1021
1029bool LLNetMap::LLShowAgentProfile::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) 1022bool LLNetMap::LLShowAgentProfile::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
1030{ 1023{
1024// [RLVa:KB] - Alternate: Imprudence-1.2.0
1025 if (gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES))
1026 {
1027 return true;
1028 }
1029// [/RLVa:KB]
1030
1031 LLNetMap *self = mPtr; 1031 LLNetMap *self = mPtr;
1032 LLFloaterAvatarInfo::show(self->mClosestAgentAtLastRightClick); 1032 LLFloaterAvatarInfo::show(self->mClosestAgentAtLastRightClick);
1033 return true; 1033 return true;
@@ -1036,6 +1036,9 @@ bool LLNetMap::LLShowAgentProfile::handleEvent(LLPointer<LLEvent> event, const L
1036bool LLNetMap::LLEnableProfile::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata) 1036bool LLNetMap::LLEnableProfile::handleEvent(LLPointer<LLEvent> event, const LLSD& userdata)
1037{ 1037{
1038 LLNetMap *self = mPtr; 1038 LLNetMap *self = mPtr;
1039 self->findControl(userdata["control"].asString())->setValue(self->isAgentUnderCursor()); 1039 //self->findControl(userdata["control"].asString())->setValue(self->isAgentUnderCursor());
1040// [RLVa:KB] - Alternate: Imprudence-1.2.0
1041 self->findControl(userdata["control"].asString())->setValue(self->isAgentUnderCursor() && !gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES));
1042// [/RLVa:KB]
1040 return true; 1043 return true;
1041} 1044}
diff --git a/linden/indra/newview/llpanelpermissions.cpp b/linden/indra/newview/llpanelpermissions.cpp
index 24bbab6..42cb88c 100644
--- a/linden/indra/newview/llpanelpermissions.cpp
+++ b/linden/indra/newview/llpanelpermissions.cpp
@@ -348,14 +348,19 @@ void LLPanelPermissions::refresh()
348 fRlvEnableOwner && owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned())); 348 fRlvEnableOwner && owners_identical && (mOwnerID.notNull() || LLSelectMgr::getInstance()->selectIsGroupOwned()));
349// [/RLVa:KB] 349// [/RLVa:KB]
350 350
351 if (owner_name != last_owner_name) 351 //if (owner_name != last_owner_name)
352// [RLVa:KB]
353 if ( (owner_name != last_owner_name) && (!gRlvHandler.hasBehaviour(RLV_BHVR_SHOWNAMES)) )
354// [/RLVa:KB]
352 { 355 {
356 childSetEnabled("Last Owner:", TRUE);
353 childSetText("Last Owner Name", last_owner_name); 357 childSetText("Last Owner Name", last_owner_name);
354 childSetEnabled("Last Owner Name", TRUE); 358 childSetEnabled("Last Owner Name", TRUE);
355 childSetEnabled("button last owner profile", TRUE); 359 childSetEnabled("button last owner profile", TRUE);
356 } 360 }
357 else 361 else
358 { 362 {
363 childSetEnabled("Last Owner:", FALSE);
359 childSetText("Last Owner Name", LLStringUtil::null); 364 childSetText("Last Owner Name", LLStringUtil::null);
360 childSetEnabled("Last Owner Name", FALSE); 365 childSetEnabled("Last Owner Name", FALSE);
361 childSetEnabled("button last owner profile", FALSE); 366 childSetEnabled("button last owner profile", FALSE);
diff --git a/linden/indra/newview/llvoavatar.cpp b/linden/indra/newview/llvoavatar.cpp
index 24272d8..431ef96 100644
--- a/linden/indra/newview/llvoavatar.cpp
+++ b/linden/indra/newview/llvoavatar.cpp
@@ -295,6 +295,9 @@ F32 LLVOAvatar::sUnbakedTime = 0.f;
295F32 LLVOAvatar::sUnbakedUpdateTime = 0.f; 295F32 LLVOAvatar::sUnbakedUpdateTime = 0.f;
296F32 LLVOAvatar::sGreyTime = 0.f; 296F32 LLVOAvatar::sGreyTime = 0.f;
297F32 LLVOAvatar::sGreyUpdateTime = 0.f; 297F32 LLVOAvatar::sGreyUpdateTime = 0.f;
298LLVector3d LLVOAvatar::sBeamLastAt;
299int LLVOAvatar::sPartsNow;
300
298 301
299struct LLAvatarTexData 302struct LLAvatarTexData
300{ 303{
@@ -3445,6 +3448,26 @@ void LLVOAvatar::idleUpdateTractorBeam()
3445 if (!needsRenderBeam() || !mIsBuilt) 3448 if (!needsRenderBeam() || !mIsBuilt)
3446 { 3449 {
3447 mBeam = NULL; 3450 mBeam = NULL;
3451 if(gSavedSettings.getBOOL("ParticleChat"))
3452 {
3453 if(sPartsNow != FALSE)
3454 {
3455 sPartsNow = FALSE;
3456 LLMessageSystem* msg = gMessageSystem;
3457 msg->newMessageFast(_PREHASH_ChatFromViewer);
3458 msg->nextBlockFast(_PREHASH_AgentData);
3459 msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
3460 msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
3461 msg->nextBlockFast(_PREHASH_ChatData);
3462 msg->addStringFast(_PREHASH_Message, "stop");
3463 msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
3464 msg->addS32("Channel", 9000);
3465
3466 gAgent.sendReliableMessage();
3467 sBeamLastAt = LLVector3d::zero;
3468 LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
3469 }
3470 }
3448 } 3471 }
3449 else if (!mBeam || mBeam->isDead()) 3472 else if (!mBeam || mBeam->isDead())
3450 { 3473 {
@@ -3463,6 +3486,48 @@ void LLVOAvatar::idleUpdateTractorBeam()
3463 { 3486 {
3464 // get point from pointat effect 3487 // get point from pointat effect
3465 mBeam->setPositionGlobal(gAgent.mPointAt->getPointAtPosGlobal()); 3488 mBeam->setPositionGlobal(gAgent.mPointAt->getPointAtPosGlobal());
3489
3490 if(gSavedSettings.getBOOL("ParticleChat"))
3491 {
3492 if(sPartsNow != TRUE)
3493 {
3494 sPartsNow = TRUE;
3495 LLMessageSystem* msg = gMessageSystem;
3496 msg->newMessageFast(_PREHASH_ChatFromViewer);
3497 msg->nextBlockFast(_PREHASH_AgentData);
3498 msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
3499 msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
3500 msg->nextBlockFast(_PREHASH_ChatData);
3501 msg->addStringFast(_PREHASH_Message, "start");
3502 msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
3503 msg->addS32("Channel", 9000);
3504
3505 gAgent.sendReliableMessage();
3506
3507 LLViewerStats::getInstance()->incStat(LLViewerStats::ST_CHAT_COUNT);
3508 }
3509 //LLVector3d a = sBeamLastAt-gAgent.mPointAt->getPointAtPosGlobal();
3510 //if(a.length > 2)
3511 if( (sBeamLastAt-gAgent.mPointAt->getPointAtPosGlobal()).length() > .2)
3512 //if(sBeamLastAt!=gAgent.mPointAt->getPointAtPosGlobal())
3513 {
3514 sBeamLastAt = gAgent.mPointAt->getPointAtPosGlobal();
3515
3516 LLMessageSystem* msg = gMessageSystem;
3517 msg->newMessageFast(_PREHASH_ChatFromViewer);
3518 msg->nextBlockFast(_PREHASH_AgentData);
3519 msg->addUUIDFast(_PREHASH_AgentID, gAgent.getID());
3520 msg->addUUIDFast(_PREHASH_SessionID, gAgent.getSessionID());
3521 msg->nextBlockFast(_PREHASH_ChatData);
3522 msg->addStringFast(_PREHASH_Message, llformat("<%.6f, %.6f, %.6f>",(F32)(sBeamLastAt.mdV[VX]),(F32)(sBeamLastAt.mdV[VY]),(F32)(sBeamLastAt.mdV[VZ])));
3523 msg->addU8Fast(_PREHASH_Type, CHAT_TYPE_WHISPER);
3524 msg->addS32("Channel", 9000); // *TODO: make configurable
3525
3526 gAgent.sendReliableMessage();
3527 }
3528
3529 }
3530
3466 mBeam->triggerLocal(); 3531 mBeam->triggerLocal();
3467 } 3532 }
3468 else if (selection->getFirstRootObject() && 3533 else if (selection->getFirstRootObject() &&
diff --git a/linden/indra/newview/llvoavatar.h b/linden/indra/newview/llvoavatar.h
index 9806ceb..8607383 100644
--- a/linden/indra/newview/llvoavatar.h
+++ b/linden/indra/newview/llvoavatar.h
@@ -918,6 +918,9 @@ public:
918 static F32 sGreyTime; // Total seconds with >=1 grey avatars 918 static F32 sGreyTime; // Total seconds with >=1 grey avatars
919 static F32 sGreyUpdateTime; // Last time stats were updated (to prevent multiple updates per frame) 919 static F32 sGreyUpdateTime; // Last time stats were updated (to prevent multiple updates per frame)
920 920
921 static int sPartsNow;
922 static LLVector3d sBeamLastAt;
923
921 //-------------------------------------------------------------------- 924 //--------------------------------------------------------------------
922 // Texture Layer Sets and Global Colors 925 // Texture Layer Sets and Global Colors
923 //-------------------------------------------------------------------- 926 //--------------------------------------------------------------------
diff --git a/linden/indra/newview/llwindlightremotectrl.cpp b/linden/indra/newview/llwindlightremotectrl.cpp
index 591b413..510e1df 100644
--- a/linden/indra/newview/llwindlightremotectrl.cpp
+++ b/linden/indra/newview/llwindlightremotectrl.cpp
@@ -41,6 +41,9 @@
41#include "llwlparammanager.h" 41#include "llwlparammanager.h"
42#include "llviewercontrol.h" 42#include "llviewercontrol.h"
43 43
44// [RLVa:KB] - Alternate: Imprudence-1.2.0
45#include "rlvhandler.h"
46// [/RLVa:KB]
44 47
45class LLWindlightRemoteObserver : public LLWLPresetsObserver 48class LLWindlightRemoteObserver : public LLWLPresetsObserver
46{ 49{
@@ -85,6 +88,14 @@ void LLWindlightRemoteCtrl::draw()
85 } 88 }
86 } 89 }
87 90
91// [RLVa:KB] - Alternate: Imprudence-1.2.0
92 if (rlv_handler_t::isEnabled())
93 {
94 childSetEnabled("Environment", !gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
95 mPresetsCombo->setEnabled(!gRlvHandler.hasBehaviour(RLV_BHVR_SETENV));
96 }
97// [/RLVA:KB]
98
88 LLPanel::draw(); 99 LLPanel::draw();
89} 100}
90 101
diff --git a/linden/indra/newview/llworldmapview.cpp b/linden/indra/newview/llworldmapview.cpp
index 947bdfd..485a895 100644
--- a/linden/indra/newview/llworldmapview.cpp
+++ b/linden/indra/newview/llworldmapview.cpp
@@ -682,9 +682,8 @@ void LLWorldMapView::draw()
682 LLFontGL::LEFT, 682 LLFontGL::LEFT,
683 LLFontGL::BASELINE, 683 LLFontGL::BASELINE,
684 LLFontGL::DROP_SHADOW); 684 LLFontGL::DROP_SHADOW);
685
686 mesg = info->mName;
687 } 685 }
686 mesg = info->mName;
688 } 687 }
689 else 688 else
690 { 689 {
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
index 3485812..54f7775 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_mini_map.xml
@@ -51,7 +51,7 @@
51 tool_tip="Offer this friend a teleport to your current location" width="80" /> 51 tool_tip="Offer this friend a teleport to your current location" width="80" />
52 <button bottom_delta="-25" follows="top|right" height="22" label="Track" 52 <button bottom_delta="-25" follows="top|right" height="22" label="Track"
53 left_delta="0" name="track_btn" 53 left_delta="0" name="track_btn"
54 tool_tip="Create a beacon to track this avatar" width="80" /> 54 tool_tip="Create a beacon to track friends you can map" width="80" />
55 <button bottom_delta="-25" follows="top|right" height="22" label="Invite..." 55 <button bottom_delta="-25" follows="top|right" height="22" label="Invite..."
56 left_delta="0" name="invite_btn" 56 left_delta="0" name="invite_btn"
57 tool_tip="Remove this person from your friends list" width="80" /> 57 tool_tip="Remove this person from your friends list" width="80" />
diff --git a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
index a57c568..00f3f3e 100644
--- a/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/floater_tools.xml
@@ -389,7 +389,7 @@
389 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 389 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
390 bottom_delta="-20" drop_shadow_visible="true" follows="left|top" 390 bottom_delta="-20" drop_shadow_visible="true" follows="left|top"
391 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10" 391 font="SansSerifSmall" h_pad="0" halign="left" height="16" left="10"
392 mouse_opaque="true" name="LastOwner:" v_pad="0" width="78"> 392 mouse_opaque="true" name="Last Owner:" v_pad="0" width="78">
393 Last Owner: 393 Last Owner:
394 </text> 394 </text>
395 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false" 395 <text bg_visible="false" border_drop_shadow_visible="false" border_visible="false"
diff --git a/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
index 0172b41..d1f5fc8 100644
--- a/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
+++ b/linden/indra/newview/skins/default/xui/en-us/menu_mini_map.xml
@@ -25,7 +25,7 @@
25 <on_check function="MiniMap.CheckRotate" userdata="" /> 25 <on_check function="MiniMap.CheckRotate" userdata="" />
26 </menu_item_check> 26 </menu_item_check>
27 <menu_item_separator /> 27 <menu_item_separator />
28 <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Show Map" 28 <menu_item_call bottom_delta="-18" enabled = "false" height="18" label="Show World Map"
29 left="0" mouse_opaque="true" name="Show Map" width="128"> 29 left="0" mouse_opaque="true" name="Show Map" width="128">
30 <on_click function="MiniMap.ShowWorldMap" userdata="" /> 30 <on_click function="MiniMap.ShowWorldMap" userdata="" />
31 </menu_item_call> 31 </menu_item_call>
generated by cgit v1.1 at 2024-11-15 09:27:22 +0000