From 2945882258ad1befe8e8094c0a1a655e4ddbcd30 Mon Sep 17 00:00:00 2001 From: Kyle Ambroff Date: Wed, 17 Sep 2008 10:21:38 +0000 Subject: svn merge -r95195:96886 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-24-Server --> release Merging fixes from 1.24 Server. From vcr-maint-2: * QAR-856: viewer crash log analyzer updates. From direct-slurl-1: * login.cgi: simplification of the way start-locations are chosen and the new-user browser tutorial is shown. * No longer fake ever-logged-in flag * support for dataservice query string encryption from maint-server-4: * DEV-19961: llInstantMessages of length N fail. from landstore-v2-01-merge: * DEV-12330: Allow Neighbors & Tweaks. * DEV-14126: Re-order items on Region Detail page. * DEV-14064: Add "Delete" order buttons in the View Cart area. * DEV-15026: Indicate in the Event Log whether purchase is a Openspace or regular region. * DEV-15242: disable checkout button after first click. * DEV-15285: Region Names in cart or fulfilled should expire after 30 min or when delivered. * DEV-14018: No currency listed for land prices * DEV-1688: Tool: Ability to view and clear Allowed Neighbors from a region. * DEV-17199: Fatal error when adding your login name to your allowed neighbors list. * DEV-17251: Deleting an unavailable item from the shopping cart causes a fatal error. * DEV-17291: Fatal error occurs when performing various activities. * DEV-17177: Typo on Land store 2.01 checkout page. From 1.24: * DEV-19865 (SVC-2927): Abandoning land changes land name and description even when done by an Estate Manager. * DEV-19916 (SVC-2938): bug fix for llGetNextEmail() failure. * DEV-19936 (SVC-2962): adding a value to a list also modifies the list in place. * SVC-2750, SVC-2958, SVC-2973: Changed LSL scheduler logic to yield if finished and no state change is pending. * indra/lib/python/indra/agent/auth.py no longer assumes there is a critical message, and checks credential as specified by OGP rev3. * DEV-20051: Added defensive checks on script rez path. * Improvements to scripts/make_deploy_group.py. * DEV-18897: llScriptReset wasn't resetting events for LSL scripts. * DEV-20127: Fix for stl misuse in newsim/llsimparcel.cpp. * DEV-18897: Mono Beta - LSL attach() event survives reset. * DEV-20212 (VWR-9026): String fix - Attempting to teleport to "Help Island" produces a dialog referencing "Orientation Island" * DEV-20164: llListen caching indefinitely across states. * DEV-19950: timer() event triggers before on_rez(), & state_entry() * DEV-19712 (SVC-2908): C# error messages with Mono Compiled scripts * Fixes for chat service unit tests. * DEV-19106: (SVC-1571): Rezzing a coalesced objects with 1024 scripted prims fails. --- indra/llcommon/llkeythrottle.h | 2 +- indra/llcommon/llversionserver.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'indra/llcommon') diff --git a/indra/llcommon/llkeythrottle.h b/indra/llcommon/llkeythrottle.h index ac2f4254f2..7bbf2ad616 100644 --- a/indra/llcommon/llkeythrottle.h +++ b/indra/llcommon/llkeythrottle.h @@ -243,7 +243,7 @@ public: } // Set the throttling behavior - void setParameters( U32 limit, F32 interval, BOOL realtime ) + void setParameters( U32 limit, F32 interval, BOOL realtime = TRUE ) { // limit is the maximum number of keys // allowed per interval (in seconds or frames) diff --git a/indra/llcommon/llversionserver.h b/indra/llcommon/llversionserver.h index fd5f6497c2..efd611090c 100644 --- a/indra/llcommon/llversionserver.h +++ b/indra/llcommon/llversionserver.h @@ -34,8 +34,8 @@ const S32 LL_VERSION_MAJOR = 1; const S32 LL_VERSION_MINOR = 24; -const S32 LL_VERSION_PATCH = 0; -const S32 LL_VERSION_BUILD = 93453; +const S32 LL_VERSION_PATCH = 6; +const S32 LL_VERSION_BUILD = 0; const char * const LL_CHANNEL = "Second Life Server"; -- cgit v1.2.3