aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/OpenSim/Framework (follow)
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into careminsterMelanie2013-02-0514-13/+273
|\
| * Merge branch 'dynamic-attributes2'Justin Clark-Casey (justincc)2013-02-051-0/+260
| |\
| | * Added DynAttrs to the serialized XML format of prims. When copying prims, use...Oren Hurvitz2013-01-251-2/+24
| | * Stopped storing dynamic attributes in the PrimShapeOren Hurvitz2013-01-251-7/+0
| | * Changed DAMap to be the container of "data stores", which are OSDMaps. Store ...Oren Hurvitz2013-01-251-20/+84
| | * Lock DAMap rather than encapsulated OSDMapJustin Clark-Casey (justincc)2013-01-251-17/+18
| | * Encapsulate an OSDMap in DAMap (was DynAttrsOSDMap) rather than inheriting fr...Justin Clark-Casey (justincc)2013-01-253-82/+176
| | * Implement Dynamic Attributes for SOP and PBS. Implement storage in SQLiteJustin Clark-Casey (justincc)2013-01-252-0/+86
| * | Bump version and assembly version numbers from 0.7.5 to 0.7.6Justin Clark-Casey (justincc)2013-02-0513-13/+13
* | | Merge branch 'master' into careminsterMelanie2013-01-311-1/+26
|\ \ \ | |/ /
| * | Allow use of MaptileStaticUUID in Regions.ini to override the global setting ...Jak Daniels2013-01-301-1/+26
| |/
* | Merge branch 'avination' into careminsterMelanie2013-01-241-2/+2
|\ \
| * | Implement get version RemoteAdmin callMelanie2013-01-231-2/+2
* | | Merge branch 'master' into careminsterMelanie2013-01-232-4/+23
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of /home/opensim/var/repo/opensimBlueWall2013-01-233-7/+22
| |\ \
| * | | Add additional return statusBlueWall2013-01-232-4/+23
* | | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ...Melanie2013-01-233-5/+58
|\ \ \ \
| * \ \ \ Merge branch 'avination'Melanie2013-01-193-5/+58
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge remote-tracking branch 'remotes/origin/avination' into teravusworkteravus2013-01-162-8/+6
| | |\ \ \
| | | * | | Add a way to put things at the front of the queue for any throttle group.Melanie2013-01-162-4/+6
| | | * | | Complete removal of the now unused state queueMelanie2013-01-161-4/+0
| | * | | | * Document the additional Visual Params of newer browsers in AvatarAppearance...teravus2013-01-141-1/+52
| | |/ / /
* | | | | Merge branch 'master' into careminsterMelanie2013-01-231-2/+7
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| |
| * | | Assign the SmartThreadPool name in the constructorOren Hurvitz2013-01-191-2/+7
* | | | Merge branch 'master' into careminsterMelanie2013-01-192-4/+14
|\ \ \ \ | |/ / /
| * | | Explicitly stop PollServiceRequestManager() rather than relying on its destru...Justin Clark-Casey (justincc)2013-01-192-5/+15
| | |/ | |/|
* | | Merge branch 'master' into careminsterMelanie2013-01-181-0/+12
|\ \ \ | |/ /
| * | Merge branch 'master' of ssh://opensimulator.org/var/git/opensimRobert Adams2013-01-171-4/+0
| |\ \
| * | | Add utility function to clamp a vector to a maximum magnitude.Robert Adams2013-01-171-0/+12
* | | | Merge branch 'master' into careminsterMelanie2013-01-161-4/+0
|\ \ \ \ | | |/ / | |/| |
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensimMelanie2013-01-165-0/+298
| |\ \ \ | | |/ /
| * | | Complete removal of the now unused state queueMelanie2013-01-161-4/+0
* | | | Merge commit 'f54b398540698e6e09022fe77b6405624b532f5c' into careminsterMelanie2013-01-165-0/+298
|\ \ \ \ | | |/ / | |/| |
| * | | Add Json-Rpc 2.0 To Registered HandlersBlueWall2013-01-155-0/+298
| |/ /
* | | Merge branch 'master' into careminsterMelanie2013-01-101-5/+5
|\ \ \ | |/ /
| * | revert accidental change to MemoryWatchdog stat calculation in previous b1b4687Justin Clark-Casey (justincc)2013-01-101-1/+1
| * | Add "show script timers" command to show script timers. For debug purposes.Justin Clark-Casey (justincc)2013-01-101-1/+1
| * | minor: Remove unnecessary commented out code from last commit c28a2f05 and fi...Justin Clark-Casey (justincc)2013-01-091-4/+1
| * | minor: make spacing consistent in console help outputJustin Clark-Casey (justincc)2013-01-091-3/+6
* | | Merge branch 'avination' into careminsterMelanie2013-01-102-3/+129
|\ \ \ | | |/ | |/|
| * | * This finishes the implementation of AgentCachedTexture. Requires the XBak...teravus2012-12-292-3/+129
* | | Merge branch 'avination' into careminsterMelanie2013-01-064-2/+48
|\ \ \ | |/ /
| * | check land permitions on sit target for unscripted sitsUbitUmarov2013-01-031-0/+1
| * | * Partial Commit for Avatar Appearance to include the functionality of Cached...teravus2012-12-213-2/+47
* | | Merge branch 'master' into careminsterMelanie2013-01-042-7/+19
|\ \ \ | | |/ | |/|
| * | Allow registering regions whose names are equivalent under LIKE but not truly...Oren Hurvitz2013-01-021-0/+11
| * | Fix indenting on ConsoleDisplayTable, align indenting on "show animations" co...Justin Clark-Casey (justincc)2013-01-021-2/+3
| * | minor: Allow objects to be added directly to a row on a ConsoleDisplayTable r...Justin Clark-Casey (justincc)2013-01-021-1/+1
| * | Add "show animations" console command for debug purposes.Justin Clark-Casey (justincc)2013-01-021-4/+4
* | | Merge branch 'master' into careminsterMelanie2013-01-021-1/+2
|\ \ \ | |/ /
generated by cgit v1.1 at 2024-08-23 15:47:24 +0000