aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-11-0825-7617/+7967
|\
| * If the LSL state_entry() event definition contains any parameters, then gener...Justin Clark-Casey (justincc)2013-11-024-7471/+7692
| * add null check for jpeg2000 sculpt image decode failure. Note: the j2kDecodeC...dahlia2013-11-011-0/+9
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimdahlia2013-11-011-1/+1
| |\
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-11-011-1/+5
| | |\
| | * | For individual bots, seed random number generator with a random number from B...Justin Clark-Casey (justincc)2013-11-011-1/+1
| * | | discard alpha in 4-plane sculpt textures before generating physics proxy meshdahlia2013-11-011-12/+7
| | |/ | |/|
| * | add new particle system blending rule enumerationsdahlia2013-10-311-1/+5
| |/
| * minor: change "bot" pCampBot help cateogry to "Bots"Justin Clark-Casey (justincc)2013-11-011-12/+12
| * Start counting resent packets in the places that I missed when the stat was f...Justin Clark-Casey (justincc)2013-10-312-0/+8
| * minor: remove mono compiler warnings in AvatarPickerSearchModule and UploadBa...Justin Clark-Casey (justincc)2013-10-312-7/+3
| * Add OutgoingPacketsResentCount clientstack stat.Justin Clark-Casey (justincc)2013-10-312-1/+32
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-10-311-0/+13
| |\
| | * add new LSL constants associated with new "ribbon", "glow", and "blend" parti...dahlia2013-10-311-0/+13
| * | minor: update pCampbot usage/help statementJustin Clark-Casey (justincc)2013-10-311-4/+4
| |/
| * Make "fcache status" command also display information on disk/mem cache hit r...Justin Clark-Casey (justincc)2013-10-301-18/+38
| * Put fcache commands output to console, not logJustin Clark-Casey (justincc)2013-10-301-28/+25
| * Give the caller AddMapTile a valid reason response if this failed due to blan...Justin Clark-Casey (justincc)2013-10-291-8/+11
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-10-281-7/+7
| |\
| | * BulletSim: update collision flags to make sure they fit in the shorts provided.Robert Adams2013-10-261-7/+7
| * | Remove legacy sqlite lines added internally by OpenSimulator to the [Startup]...Justin Clark-Casey (justincc)2013-10-283-8/+1
| |/
| * minor: Add commented out code for apparent passing of texture IDs in ObjectPr...Justin Clark-Casey (justincc)2013-10-241-0/+26
| * Show texture ids for full object/part info console commmdsJustin Clark-Casey (justincc)2013-10-241-1/+16
| * Comment out LLUDPServer.BroadcastPacket() to reduce code complexity. Appears...Justin Clark-Casey (justincc)2013-10-241-38/+38
| * Only set the data present event if we actually queued an outoing packet (not ...Justin Clark-Casey (justincc)2013-10-241-4/+17
| * BulletSim: change collision flags for groundplane to not interact with static...Robert Adams2013-10-234-7/+13
* | Merge branch 'master' into careminsterMelanie2013-11-0363-252/+13356
|\ \ | |/
| * Call ScriptSleep() instead of llSleep() in routine for llEmail.Kevin Cozens2013-10-181-1/+1
| * After finishing to edit an attachment, let other avatars see the changes. (Th...Oren Hurvitz2013-10-172-8/+4
| * Corrected estateID to EstateID on getEstates function at PGSQLEstateData.csFernando Oliveira2013-10-161-1/+1
| * * One More thing, add an appdomain data element to ensure that we don't dupli...Fernando Oliveira2013-10-162-4/+15
| * * Fixes mantis mantis 0006803 [PGSQL] - Simulator crashes - Mono.Security.dll...Fernando Oliveira2013-10-162-0/+47
| * BulletSim: implement the SL bug where VEHICLE_HOVER_UP_ONLY disablesRobert Adams2013-10-151-0/+12
| * Fixed rezzing coalesced objects from a prim's inventoryOren Hurvitz2013-10-155-134/+188
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2013-10-154-9/+40
| |\
| | * * Fixes mantis #6802 Simulator crashes whist loading (lighshare enabled)fernando2013-10-154-9/+40
| * | Added support for attachments to group notices when using Flotsam groups.Kevin Cozens2013-10-151-50/+122
| |/
| * Made terrain uploads thread-safeOren Hurvitz2013-10-154-22/+45
| * Fernando Oliveira's Postgress SQL Server Data Connector as a single commit.Fernando Oliveira2013-10-1240-0/+11892
| * BulletSim: Fix snap back from edge of region problem. Mantis 6794.Robert Adams2013-10-111-2/+13
| * * Add a session concurrency option per key. Allows developer/config to speci...teravus2013-10-094-23/+102
| * * Remove a test *cleanup*teravus2013-10-071-10/+2
| * * Move the BasicDOSProtector.cs to OpenSim.Framework (all useful classes belo...teravus2013-10-071-1/+29
| * * Refactorteravus2013-10-077-415/+218
| * * Added a Basic DOS protection container/base object for the most common HTTP...teravus2013-10-079-6/+1059
* | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-10-066-6/+34
|\ \
| * | * Fixes cases where Last Attachment Point gets overwritten with 0 when it sho...teravus2013-10-054-4/+12
| * | Merge branch 'master' of careminster:/var/git/careminsterteravus2013-10-0470-673/+2748
| |\ \
| * \ \ Merge branch 'master' of careminster:/var/git/careminsterteravus2013-09-1611-76/+98
| |\ \ \
| * | | | * This fixes the border crossing offsets by storing the final keyframe locati...teravus2013-09-161-2/+22