aboutsummaryrefslogtreecommitdiffstatshomepage
Commit message (Expand)AuthorAgeFilesLines
* Revert "If a user has the rights to edit a parcel's properties, then also all...root2011-07-051-4/+4
* Merge branch 'master' into careminster-presence-refactorroot2011-07-0526-301/+752
|\
| * Add TestClearCache()Justin Clark-Casey (justincc)2011-07-041-0/+17
| * add TestExpireAsset()Justin Clark-Casey (justincc)2011-07-041-0/+20
| * refactor: Move test setup code into setup methodJustin Clark-Casey (justincc)2011-07-041-13/+20
| * Make it possible to disable the file part of the flotsam asset cacheJustin Clark-Casey (justincc)2011-07-043-40/+78
| * refactor: Split file cache manipulation code into separate methods, as has al...Justin Clark-Casey (justincc)2011-07-041-102/+131
| * Add basic flotsam asset cache test for retrieved cached asset.Justin Clark-Casey (justincc)2011-07-046-0/+106
| * If a user has the rights to edit a parcel's properties, then also allow them ...Justin Clark-Casey (justincc)2011-07-021-4/+4
| * Add profile, merge, noassets and skip-assets options for loading/saving oars ...Justin Clark-Casey (justincc)2011-07-021-2/+39
| * Create a very basic initial test which just creates an 'npc' and tests that t...Justin Clark-Casey (justincc)2011-07-025-4/+75
| * refactor: simplify existing npc code by creating them directly rather than in...Justin Clark-Casey (justincc)2011-07-021-102/+37
| * Make default serverside_object_permissions = true since this better matches u...Justin Clark-Casey (justincc)2011-07-015-15/+4
| * If OpenSim has been built from a git tree, then include version information a...Justin Clark-Casey (justincc)2011-07-011-4/+39
| * refactor: rename gitCommitFileName to manualVersionFileName since bin/.versio...Justin Clark-Casey (justincc)2011-07-011-5/+4
| * fix build break I just introducedJustin Clark-Casey (justincc)2011-07-011-2/+1
| * Add an async inventory details sender to respond to FetchInventory packets.Justin Clark-Casey (justincc)2011-07-015-28/+165
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-06-302-5/+21
| |\
| | * Allow physics proxy generation for meshes using new asset format.dahlia2011-06-292-5/+21
| * | improve and tidy up some config file commentsJustin Clark-Casey (justincc)2011-06-302-14/+20
| * | minor: adjust some indentation and spacing in OpenSim.ini.example for consist...Justin Clark-Casey (justincc)2011-06-301-19/+25
| |/
* | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2011-07-0527-173/+559
|\ \
| * \ Merge branch 'master' into careminster-presence-refactorroot2011-06-3027-173/+559
| |\ \ | | |/
| | * Don't follow inventory links of links.Justin Clark-Casey (justincc)2011-06-291-1/+4
| | * refactor: simplify redundant double containing folder checkJustin Clark-Casey (justincc)2011-06-291-2/+4
| | * If an inventory link target is in the same folder as the source, then don't r...Justin Clark-Casey (justincc)2011-06-291-1/+6
| | * Hack around with the NPC module to get osNpcCreate() partially working again.Justin Clark-Casey (justincc)2011-06-297-43/+85
| | * [PATCH 2/2] [FIX] osGetPrimitiveParams() and osSetPrimitiveParams()Makopoppo2011-06-281-0/+2
| | * [PATCH] osSetSpeed() will accept float numberMakopoppo2011-06-283-4/+4
| | * [PATCH] Get osGetWindParam() and osSetWindParam() accessibleMakopoppo2011-06-283-15/+14
| | * [PATCH 1/2] Fixed the function names of some OSSL functions shown asMakopoppo2011-06-281-3/+3
| | * [PATCH] Changed Wind parameters default value in OpenSim.ini.exampleMakopoppo2011-06-281-2/+2
| | * minor: temporarily comment out the local status notify friends messages seen ...Justin Clark-Casey (justincc)2011-06-271-1/+1
| | * Remove the now unused [cms] section from OpenSimDefaults.iniJustin Clark-Casey (justincc)2011-06-251-5/+0
| | * Fix bug in reset user password where entering an invalid name would cause an ...Justin Clark-Casey (justincc)2011-06-251-4/+7
| | * Implement "set user level" console command to set the user level (which deter...Justin Clark-Casey (justincc)2011-06-251-0/+47
| | * Add a command "show account <first-name> <last-Name>" to the user account ser...Justin Clark-Casey (justincc)2011-06-241-1/+38
| | * Changed actual default values of 'ServiceConnectorModule' and 'MessagingModul...Makopoppo2011-06-243-3/+3
| | * Optionally, don't delete previously compiled scripts on startupOren Hurvitz2011-06-242-5/+20
| | * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimJustin Clark-Casey (justincc)2011-06-241-0/+2
| | |\
| | | * Merge branch 'master' of /home/opensim/src/opensimBlueWall2011-06-241-0/+2
| | | |\
| | | | * RegionReady Module:BlueWall2011-06-241-0/+2
| | * | | Implement the latest mesh mechanism so that rezzing the uploaded mesh now wor...Justin Clark-Casey (justincc)2011-06-242-6/+195
| | |/ /
| | * | minor: method documentationJustin Clark-Casey (justincc)2011-06-241-6/+8
| | * | Tell hypergridders when their teleports fail because of the 4096 limit rather...Justin Clark-Casey (justincc)2011-06-247-75/+117
* | | | Don't store the default WL profile. This will prevent "valid" from beingMelanie2011-07-051-1/+1
* | | | Stop displaying "Sending windowslig profile to client" when WL is disabledMelanie2011-07-051-1/+2
|/ / /
* | | Remove friends debug spamMelanie2011-06-202-2/+2
* | | Merge branch 'careminster-presence-refactor' of ssh://3dhosting.de/var/git/ca...Melanie2011-06-20146-4409/+8211
|\ \ \
| * \ \ Merge branch 'master' into careminster-presence-refactorMelanie2011-06-2020-59/+573
| |\ \ \ | | |/ /