Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into careminster | Melanie | 2010-02-14 | 16 | -326/+120 |
|\ | |||||
| * | Apply last two patches from http://opensimulator.org/mantis/view.php?id=3522 | Justin Clark-Casey (justincc) | 2010-02-12 | 8 | -50/+50 |
| | | | | | | | | | | | | These patch should allow people using systems that do not have their locale set to En_US or similar to use OpenSim without suffering effects such as being a million miles up in the air on login. The problem was caused by parsing strings without forcing that parse to be En_US (hence different decimal and digit group symbols were causing problems). Thanks very much to VikingErik for doing the legwork on this fix and phacelia for spotting it in the first place. | ||||
| * | minor: remove completely commented out and unused class | Justin Clark-Casey (justincc) | 2010-02-12 | 1 | -226/+0 |
| | | |||||
| * | Fix http://opensimulator.org/mantis/view.php?id=4224 | Justin Clark-Casey (justincc) | 2010-02-12 | 8 | -50/+70 |
| | | | | | | | | | | | | | | This resolves the problem where eyes and hair would turn white on standalone configurations When a client receives body part information, for some insane reason or other it always ends up uploading this back to the server and then immediately re-requesting it. This should have been okay since we stored that asset in cache. However, the standalone asset service connector was not checking this cache properly, so every time the client made the request for the asset it has just loaded it would get a big fat null back in the face, causing it to make clothes and hair white. This bug did not affect grids since they use a different service connector. | ||||
* | | Merge branch 'master' of ssh://melanie@3dhosting.de/var/git/careminster into ↵ | Melanie | 2010-02-08 | 2 | -2/+7 |
|\ \ | | | | | | | | | | careminster | ||||
| * | | Fix two inconsistencies with LightShare | CasperW | 2010-02-05 | 2 | -2/+7 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2010-02-08 | 13 | -64/+175 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-02-08 | 2 | -18/+18 |
| |\ | |||||
| | * | endline fix 2 | Teravus Ovares (Dan Olivares) | 2010-02-06 | 1 | -6/+6 |
| | | | |||||
| | * | Endline fix | Teravus Ovares (Dan Olivares) | 2010-02-06 | 1 | -12/+12 |
| | | | |||||
| * | | add some method doc to IDynamicTextureManager | Justin Clark-Casey (justincc) | 2010-02-08 | 1 | -2/+59 |
| | | | |||||
| * | | refactor: Reuse SceneObjectGroup.IsAttachmentCheckFull() in ↵ | Justin Clark-Casey (justincc) | 2010-02-08 | 2 | -5/+12 |
| | | | | | | | | | | | | Scene.AddSceneObject since this wraps a check that is much less clear | ||||
| * | | Add EventManager.OnIncomingSceneObject event which is triggered by an ↵ | Justin Clark-Casey (justincc) | 2010-02-08 | 4 | -17/+58 |
| | | | | | | | | | | | | | | | | | | incoming scene object Add a read-only Attachments property to ScenePresence | ||||
| * | | minor: log what kind of wearable cannot be found | Justin Clark-Casey (justincc) | 2010-02-05 | 2 | -5/+6 |
| |/ | |||||
| * | Revert "Old OpenSim installations may have no AssetCaching setting in ↵ | Justin Clark-Casey (justincc) | 2010-02-05 | 1 | -3/+1 |
| | | | | | | | | | | | | | | | | config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all)" This will be replaced by a better solution where an enabled baking module will fail if no cache is in place (same for dynamic texture modules) This reverts commit 7058a4c2597a2b76704e906b73ae7077ff805b16. | ||||
| * | Old OpenSim installations may have no AssetCaching setting in ↵ | Justin Clark-Casey (justincc) | 2010-02-05 | 1 | -1/+3 |
| | | | | | | | | | | | | | | config-include/StandaloneCommon.ini [Modules] (or no [Modules] at all) If this is the case, this patch makes CenomeAssetCache the default cache (which matches that selected in StandaloneCommon.ini.example) Not having an asset cache may lead to a continual loop of appearance baking failures and cause dynamic textures not to work, among other effects | ||||
| * | refactor: chain two ScenePresence constructors together to eliminate common ↵ | Justin Clark-Casey (justincc) | 2010-02-04 | 2 | -16/+14 |
| | | | | | | | | code. No functional changes | ||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-02-04 | 3 | -17/+17 |
| |\ | |||||
| | * | Applying patch #4534 by Misterblue to fix ODE physics stickiness | John Hurliman | 2010-02-04 | 1 | -0/+2 |
| | | | |||||
| * | | minor: one method doc | Justin Clark-Casey (justincc) | 2010-02-04 | 2 | -3/+8 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2010-02-04 | 6 | -371/+1190 |
|\ \ \ | | |/ | |/| | |||||
| * | | Revert "change position of OnAttach event firing so that this also happens ↵ | Melanie | 2010-02-04 | 2 | -17/+15 |
| |/ | | | | | | | | | | | | | | | when a user teleports into a region" The behavior introduced here is not compatible with SL This reverts commit b6bee4999c9d238a052022f105069ea4eb85f8f4. | ||||
| * | Merge branch 'master' of ssh://justincc@opensimulator.org/var/git/opensim | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -3/+3 |
| |\ | |||||
| * | | minor: remove one mono compiler warning | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -3/+1 |
| | | | |||||
| * | | minor: remove one mono compiler warning | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -10/+8 |
| | | | |||||
| * | | minor: add a smidgen of EventManager doc | Justin Clark-Casey (justincc) | 2010-02-03 | 2 | -6/+6 |
| | | | |||||
| * | | For each delegate added to events in the EventManager, catch and log but do ↵ | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -314/+1128 |
| | | | | | | | | | | | | | | | | | | not propogate any exceptions that come back This stops exceptions thrown by modules from disrupting the kernel and still allows other delegates to be executed normally | ||||
| * | | add an IsRoot property to sop | Justin Clark-Casey (justincc) | 2010-02-03 | 2 | -1/+24 |
| | | | |||||
| * | | minor: comment out a log line in ScenePresence | Justin Clark-Casey (justincc) | 2010-02-03 | 1 | -2/+1 |
| | | | |||||
| * | | minor: remove a couple of mono warnings | Justin Clark-Casey (justincc) | 2010-02-03 | 2 | -4/+1 |
| | | | |||||
| * | | change position of OnAttach event firing so that this also happens when a ↵ | Justin Clark-Casey (justincc) | 2010-02-03 | 2 | -15/+17 |
| | | | | | | | | | | | | user teleports into a region | ||||
| * | | refactor: move world comm message queueing into its own method | Justin Clark-Casey (justincc) | 2010-02-02 | 1 | -23/+13 |
| | | | |||||
* | | | Line endings cleanup | Melanie | 2010-02-04 | 1 | -36/+36 |
| | | | |||||
* | | | Merge branch 'master' into careminster | Melanie | 2010-02-03 | 4 | -20/+60 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' of melanie@opensimulator.org:/var/git/opensim | Melanie | 2010-02-03 | 4 | -17/+57 |
| |\ \ | | |/ | |||||
| | * | minor: copy some method doc from the WorldComm implementation to the interface | Justin Clark-Casey (justincc) | 2010-02-02 | 1 | -0/+39 |
| | | | |||||
| | * | minor: add method doc to sop.SetScriptEvents() | Justin Clark-Casey (justincc) | 2010-02-02 | 1 | -0/+5 |
| | | | |||||
| | * | minor: add some documentation to EventManager.OnObjectGrab | Justin Clark-Casey (justincc) | 2010-02-02 | 1 | -15/+8 |
| | | | |||||
| | * | minor: add reminder to lock SOG.Children before using it directly in order ↵ | Justin Clark-Casey (justincc) | 2010-02-02 | 1 | -2/+5 |
| | | | | | | | | | | | | to avoid threading issues | ||||
| * | | allow terrain collision events after regular collision check | radams1 | 2010-02-03 | 1 | -3/+3 |
| |/ | | | | | | | Signed-off-by: Melanie <melanie@t-data.com> | ||||
* | | Merge branch 'master' into careminster | Melanie | 2010-02-02 | 13 | -282/+472 |
|\ \ | |||||
| * | | Revert "improve locking of m_items in SceneObjectPartInventory" | Melanie | 2010-02-02 | 1 | -133/+85 |
| |/ | | | | | | | This reverts commit 968b9e160d70568fbdea5b190d1386e9431316e3. | ||||
| * | minor: rename GetScriptPrimType() to GetPrimType() | Justin Clark-Casey (justincc) | 2010-02-01 | 2 | -4/+4 |
| | | |||||
| * | move hollow sphere faces bug back up to LSL_Api.cs | Justin Clark-Casey (justincc) | 2010-02-01 | 2 | -37/+52 |
| | | |||||
| * | remove now duplicated shape code from LSL_Api.cs | Justin Clark-Casey (justincc) | 2010-02-01 | 2 | -194/+49 |
| | | |||||
| * | Copy prim face color setting code from LSL_Api down into SOP so that non-LSL ↵ | Justin Clark-Casey (justincc) | 2010-02-01 | 2 | -1/+192 |
| | | | | | | | | callers can use it | ||||
| * | Actually make EventManager.OnAttach() fire when an object is attached. ↵ | Justin Clark-Casey (justincc) | 2010-02-01 | 2 | -2/+6 |
| | | | | | | | | Previously, only detach was firing! | ||||
| * | Don't try to start attachment scripts or send updates if the attachment ↵ | Justin Clark-Casey (justincc) | 2010-02-01 | 2 | -27/+64 |
| | | | | | | | | itself has been unsuccessful | ||||
| * | apply http://opensimulator.org/mantis/view.php?id=4486 | Justin Clark-Casey (justincc) | 2010-01-30 | 1 | -1/+1 |
| | | | | | | | | | | fix compilation of mrm scripts using microthreaded parmeter Thanks ziah | ||||
| * | Apply http://opensimulator.org/mantis/view.php?id=3334 | Justin Clark-Casey (justincc) | 2010-01-29 | 4 | -1/+58 |
| | | | | | | | | | | | | Send continuous touch() events if the left mouse button is held down while moving over an object This conforms with Linden Lab practice Thanks Revolution |