aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Region/CoreModules/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2011-12-182-2/+16
|\
| * Sends the consistent child agent position upon creation of the child agent in...Diva Canto2011-12-161-1/+12
| * HG minor bug fix and marked one method obsolete in UAS.Diva Canto2011-12-161-1/+4
* | Merge branch 'master' into bigmergeMelanie2011-12-051-99/+104
|\ \ | |/
| * Add beginning of ScenePresenceAgentTests.TestCreateChildScenePresence()Justin Clark-Casey (justincc)2011-12-031-1/+0
| * Stop some places where we're trying to reset animations in child agents where...Justin Clark-Casey (justincc)2011-12-021-100/+110
* | Merge branch 'master' into bigmergeMelanie2011-12-011-6/+11
|\ \ | |/
| * On "show caps", stop excluding the seed cap but do exclude it elsewhereJustin Clark-Casey (justincc)2011-11-291-1/+1
| * tabulate "show caps" output for easier readabilityJustin Clark-Casey (justincc)2011-11-291-5/+10
* | Merge branch 'master' into bigmergeMelanie2011-11-171-37/+66
|\ \ | |/
| * Fix the build breakJustin Clark-Casey (justincc)2011-11-161-1/+1
| * Look up a homeURL only when it's not null, in addition to not being string.EmptyJustin Clark-Casey (justincc)2011-11-161-1/+1
| * Enable log message to tell us what type of url is being requested from a user...Justin Clark-Casey (justincc)2011-11-151-3/+3
| * fix build break on UserManagementModule.Justin Clark-Casey (justincc)2011-11-151-7/+8
| * Do proper locking of UserManagementModule.m_UserCache when getting.Justin Clark-Casey (justincc)2011-11-151-29/+57
* | Fix taking or returning locked objects losing permissions for ownerMelanie2011-11-121-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-061-1/+1
|\ \ | |/
| * Convert SendKillObject to take a list of uint rather than sending oneMelanie2011-11-061-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-11-031-1/+1
|\ \ | |/
| * Changes UpdateFlag in SOP to an enumeration of NONE, TERSE and FULL.Dan Lake2011-11-021-1/+1
* | Merge branch 'master' into bigmergeMelanie2011-10-301-2/+2
|\ \ | |/
| * set grp.RootPart.GroupPosition for code consistency (and readability) rather ...Justin Clark-Casey (justincc)2011-10-281-2/+2
* | Merge branch 'master' into bigmergeMelanie2011-10-262-0/+2
|\ \ | |/
| * Make OpenSim.Framework.Servers.HttpServer rely on OpenSim.Framework instead o...Justin Clark-Casey (justincc)2011-10-252-0/+2
* | Merge branch 'master' into bigmergeMelanie2011-10-121-0/+8
|\ \ | |/
| * Start recording object updates per second statistic (analogue of agent update...Justin Clark-Casey (justincc)2011-10-111-0/+8
* | Merge commit '353e7ce873fb139ad4050023ce08339d953ad4d5' into bigmergeMelanie2011-10-121-0/+3
|\ \ | |/
| * Allow monitoring of stats by region nameJustin Clark-Casey (justincc)2011-10-101-0/+3
* | Merge commit '62aad4c18f1ebc0780ce47cf179f3d5550ff0837' into bigmergeMelanie2011-10-1215-20/+325
|\ \ | |/
| * Add other region stats (total frame time, physics fps, etc.) currently missin...Justin Clark-Casey (justincc)2011-10-1015-20/+325
* | Merge commit '8114f895c2973ac9e2e456ac2aaad8deb23f3852' into bigmergeMelanie2011-10-121-15/+35
|\ \ | |/
| * Provide a way to turn the MonitorModule on and offJustin Clark-Casey (justincc)2011-10-101-15/+35
| * Merge branch 'master' of ssh://opensimulator.org/var/git/opensimDan Lake2011-10-061-1/+1
| |\
* | \ Merge commit '4748c19bdbcdcaf6050e1f04a5f7394a88e0bf3e' into bigmergeMelanie2011-10-121-1/+1
|\ \ \ | |/ /
| * | Refactored "known child region" in ScenePresence. There were 4 differentDan Lake2011-10-061-1/+1
* | | Merge commit '1f78dc65041729567edc411a3e63dd9a32a268a3' into bigmergeMelanie2011-10-121-1/+1
|\ \ \ | | |/ | |/|
| * | remove the pointless slashes on the end of the (5!) different server stat ret...Justin Clark-Casey (justincc)2011-10-071-1/+1
| |/
* | Merge commit '9a16e76f5151c11fbf76e41b89f8eb03b1731828' into bigmergeMelanie2011-10-121-6/+6
|\ \ | |/
| * Simplified IsInTransit property on ScenePresence and removed InTransit() whic...Dan Lake2011-10-061-6/+6
* | Fix rezzing coalesced object broken by core mergeMelanie2011-10-121-54/+36
* | Merge commit 'e742cffe15d3e50841908d7babc2e4c4a7630635' into bigmergeMelanie2011-10-111-1/+0
|\ \ | |/
| * Add Enabled switch in new [Attachments] section in OpenSimDefaults.ini to all...Justin Clark-Casey (justincc)2011-09-301-1/+0
* | Bring us up to date.Tom2011-09-143-25/+41
|\ \ | |/
| * Add extra log information when attachments fail validationJustin Clark-Casey (justincc)2011-09-101-5/+11
| * reinstate the validation logging on teleport. A 'fail' of validation still d...Justin Clark-Casey (justincc)2011-09-101-0/+2
| * Stop the UserManagementModule logging every user it adds for nowJustin Clark-Casey (justincc)2011-09-101-3/+3
| * Use scene presence agent id for rezzed object ownership rather than item owner.Justin Clark-Casey (justincc)2011-09-081-7/+12
| * Add temporary debugging in HGInventoryBroker and RemoveXInventoryServiceConne...Justin Clark-Casey (justincc)2011-09-061-2/+0
| * Try disabling the inconsistent attachment state check to see if this actually...Justin Clark-Casey (justincc)2011-09-051-13/+18
* | First set of merge fixesTom2011-09-071-49/+49
generated by cgit v1.1 at 2024-10-22 17:58:19 +0000