aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-173-10/+4
|\
| * Merge branch 'avination' into ubitworkUbitUmarov2012-07-173-10/+4
| |\
| | * Fix merge artefactsMelanie2012-07-173-10/+4
* | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-177-83/+13
|\ \ \ | |/ /
| * | Merge branch 'avination' into ubitworkUbitUmarov2012-07-177-83/+13
| |\ \ | | |/
| | * Merge branch 'master' into careminsterMelanie2012-07-167-83/+13
| | |\
| | | * Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2012-07-161-30/+13
| | | |\
| | | | * refactor: factor out common code in WebStatsModule.OnMakeRootAgent()Justin Clark-Casey (justincc)2012-07-161-8/+7
| | | | * In WebStatsModule.OnMakeRootAgent(), get region ID directly from SP.Scene.Reg...Justin Clark-Casey (justincc)2012-07-161-18/+2
| | | | * Stop warning about no session from ViewerStats if user teleports to another r...Justin Clark-Casey (justincc)2012-07-161-6/+6
| | | * | Revert "Fix script "Running" behavior"Melanie2012-07-166-53/+0
| | | |/
* | | | Merge branch 'ubitwork' of ssh://3dhosting.de/var/git/careminster into ubitworkubit2012-07-17353-8014/+16547
|\ \ \ \ | |/ / /
| * | | Merge branch 'avination' into ubitworkUbitUmarov2012-07-17353-8014/+16547
| |\ \ \ | | |/ /
| | * | Merge branch 'avination' into careminsterMelanie2012-07-1614-207/+233
| | |\ \
| | * \ \ Merge branch 'master' into careminsterMelanie2012-07-161-1/+14
| | |\ \ \ | | | | |/ | | | |/|
| | | * | sending more user-friendly messages to the script error window rather than th...SignpostMarv2012-07-161-1/+14
| | * | | Merge branch 'master' into careminsterMelanie2012-07-163-207/+275
| | |\ \ \ | | | |/ /
| | | * | update PrimMesher.cs to dll version r72 which fixes some path errors in slice...dahlia2012-07-131-143/+183
| | | * | acting on feedback from justinccSignpostMarv2012-07-141-6/+7
| | | * | acting on feedback from justinccSignpostMarv2012-07-141-39/+42
| | | * | added in some extra variables, it sometimes thinks it is on the same parcel :(SignpostMarv2012-07-141-5/+7
| | | * | adding workaround for silent failure if position is outside the bounds of a r...SignpostMarv2012-07-141-13/+41
| | | * | Implementation of llSetRegionPos(). Does not implement failure on object entr...SignpostMarv2012-07-143-4/+45
| | | * | When generating a Warp3D texture, set the detailTexture[i] variable on resize...Justin Clark-Casey (justincc)2012-07-141-7/+14
| | * | | Merge branch 'master' into careminsterMelanie2012-07-1327-204/+169
| | |\ \ \ | | | |/ /
| | | * | Remove a callstack print out I accidentally left in 2 commits ago in 9ccb578Justin Clark-Casey (justincc)2012-07-131-1/+0
| | | * | Rather than instantiating a UTF8 encoding everywhere when we want to supress ...Justin Clark-Casey (justincc)2012-07-1315-84/+67
| | | * | Don't cache regions data on the other unused LocalGridServiceConnector that t...Justin Clark-Casey (justincc)2012-07-134-22/+42
| | | * | Stop redundantly passing in the endpoint to the LLClientView constructor.Justin Clark-Casey (justincc)2012-07-122-5/+2
| | | * | Remove IClientIPEndpoint client interface for now.Justin Clark-Casey (justincc)2012-07-122-30/+2
| | | * | Remove IClientAPI.GetClientEP() in favour of existing identical IClientAPI.Re...Justin Clark-Casey (justincc)2012-07-126-27/+2
| | | * | Change very recent AllowedViewerList and BannedViewerList config setting name...Justin Clark-Casey (justincc)2012-07-121-4/+4
| | | * | Extend "show circuits" to show circuit code, ip and viewer name.Justin Clark-Casey (justincc)2012-07-122-20/+36
| | | * | Add active status to "show connections"Justin Clark-Casey (justincc)2012-07-121-1/+7
| | | * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2012-07-122-23/+93
| | | |\ \
| | | * | | Put output for "show connections" command into standard table format.Justin Clark-Casey (justincc)2012-07-121-19/+16
| | * | | | Merge branch 'master' into careminsterMelanie2012-07-1231-166/+391
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | Many explanitory comments added to the link and delink code inRobert Adams2012-07-112-23/+93
| | | |/ /
| | | * | Where possible, use the system Encoding.ASCII and Encoding.UTF8 rather than c...Justin Clark-Casey (justincc)2012-07-1120-80/+51
| | | * | Allow XEngine StartDelay to be configured in the [XEngine] config section.Justin Clark-Casey (justincc)2012-07-113-3/+12
| | | * | Remove WorldComm module from the regression TestCompileAndStartScript() since...Justin Clark-Casey (justincc)2012-07-111-4/+1
| | | * | Add regression TestDetachScriptedAttachmentToInventory()Justin Clark-Casey (justincc)2012-07-118-32/+150
| | | * | Add regression TestRezScriptedAttachmentsFromInventory() though this currentl...Justin Clark-Casey (justincc)2012-07-113-23/+85
| | * | | Merge branch 'avination' into careminsterMelanie2012-07-1119-400/+746
| | |\ \ \
| | * \ \ \ Merge branch 'master' into careminsterMelanie2012-07-1133-305/+891
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | If a part has a sit target and an avatar is already sitting, allow another av...Justin Clark-Casey (justincc)2012-07-101-7/+4
| | | * | | refactor: move management of SOP.SitTargetAvatar into SOP.AddSittingAvatar() ...Justin Clark-Casey (justincc)2012-07-102-5/+6
| | | * | | Revert "refactor: Add SOP.IsSitTargetOccupied to improve readability"Justin Clark-Casey (justincc)2012-07-102-8/+3
| | | * | | refactor: Add SOP.IsSitTargetOccupied to improve readabilityJustin Clark-Casey (justincc)2012-07-102-3/+8
| | | * | | refactor: use sit orientation argument passed in to SP.SendSitResponse() rath...Justin Clark-Casey (justincc)2012-07-101-4/+2